git clone did not pull all the merged files-CodePudding

Another developer created a branch, worked on it, and checked in code. He also did a merge from that branch to the master. Before cloning I see the merged files in the master. But after cloning from master via xcode, it did not pull the files that were checked into branch and subsequently merged into master. I thought after merge anyone should be able to checkout master and clone and get all the merged files. But that is not happening. How to pull the entire merged code? When I run git status, I get this output:

On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   xyz/xyz.xcodeproj/project.pbxproj
    modified:   xyz/xyz.xcodeproj/project.xcworkspace/xcuserdata/HCCS.xcuserdatad/UserInterfaceState.xcuserstate
    modified:   xyz/xyz/Base.lproj/Main.storyboard

Untracked files:
  (use "git add <file>..." to include in what will be committed)
    MyPlayground.playground/playground.xcworkspace/
    MyPlayground2.playground/playground.xcworkspace/
    compare.playground/playground.xcworkspace/

no changes added to commit (use "git add" and/or "git commit -a")

I am at loss to understand the error and why it is not pulling all the files when cloned.

Some more details:

git pull

error: Your local changes to the following files would be overwritten by merge:
    r2nr/r2nr.xcodeproj/project.pbxproj
    r2nr/r2nr/Base.lproj/Main.storyboard
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        

MyPlayground.playground/playground.xcworkspace/contents.xcworkspacedata
    MyPlayground2.playground/playground.xcworkspace/contents.xcworkspacedata
    compare.playground/playground.xcworkspace/contents.xcworkspacedata
Please move or remove them before you merge.
Aborting

I ran git stash

    git stash
    'Saved working directory and index state WIP on master: 6d9b3d2 Merge branch 'branch01' Added ProviderApiCaller class to the code
    HCCS@CEASJ311-4293 green-synapse % git pull 
    Updating 6d9b3d2..35d2b7e
    error: The following untracked working tree files would be overwritten by merge:
MyPlayground.playground/playground.xcworkspace/contents.xcworkspacedata
MyPlayground2.playground/playground.xcworkspace/contents.xcworkspacedata
compare.playground/playground.xcworkspace/contents.xcworkspacedata
Please move or remove them before you merge.
Aborting

So I removed the three files:

MyPlayground.playground/playground.xcworkspace/contents.xcworkspacedata
MyPlayground2.playground/playground.xcworkspace/contents.xcworkspacedata
compare.playground/playground.xcworkspace/contents.xcworkspacedata

git pull

That seemed to work

Then I enter xcode project I get error

The project ‘r2nr’ is damaged and cannot be opened due to a parse error. Examine the project file for invalid edits or unresolved source control conflicts. Path: /Users/HCCS/myproj/r2nr/r2nr.xcodeproj.

How to resolve conflicts? *

CodePudding user response：

While git stash will save (and then git reset --hard to remove) modified files, it does nothing about untracked files by default. It seems likely that your "Another developer" committed the untracked files, which was probably a mistake on his or her part; that's what produced the errors with the untracked files.

(You can use git stash -u, but I prefer to avoid git stash in general, and git stash -u is particularly nasty to work with, so I would suggest not doing that.)

In any case, after removing your own untracked files, your git pull appears to have worked. Remember that git pull means:

run git fetch; then
run a second Git command of your choice, either git merge or git rebase

and—assuming the git fetch itself works, which it usually does—the second command may stop in the middle, or complete. The output from the command tells you which of those happened. But assuming it completed successfully, all your Git problems are now solved.

[but xcode now says]
The project ‘r2nr’ is damaged and cannot be opened due to a parse error. Examine the project file for invalid edits or unresolved source control conflicts. Path: /Users/HCCS/myproj/r2nr/r2nr.xcodeproj.

Given that your "another developer" appears, from what we know above, not to understand how to use Git, perhaps this same person committed unresolved conflicts, rather than resolving them. This is now an xcode problem, but solving it may require that you discard the other developer's work and re-do it yourself, or repair anything he or she damaged. You cannot use normal Git tools to resolve a conflict here as the conflict is already resolved (incorrectly, apparently).

CodePudding user response：

In general, I recommend since Git 2.23

git config --global pull.rebase true
git config --global rebase.autoStash true

That way, a simple git pull would stash your work in progress for you, pull, rebase your local commits on top of the updated branch, and unstash.

Then you can start resolve any conflict.
But if those are too complex regarding, you can force your own version with:

git stash show -p | git apply && git stash drop