Edit Question - KnowledgeHub

Title Body

I am using version 1.7.1 of Git. I tried using git rebase master to rebase against master from my branch. I got an error because there was a merge conflict: First, rewinding head to replay your work on top of it... Applying: checkstyled. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging AssetsLoader.java CONFLICT (content): Merge conflict in AssetsLoader.java Failed to merge in the changes. Patch failed at 0001 checkstyled. After manually editing the file to resolve the conflict, I got this result from git status : # Not currently on any branch. # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: PassengerContactHandler.java # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: AssetsLoader.java # Then, after git add AssetsLoader.java , I tried again, getting: # Not currently on any branch. # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: AssetsLoader.java # modified: PassengerContactHandler.java # But then git rebase --continue resulted in: git rebase --continue You must edit all merge conflicts and then mark them as resolved using git add I know I can skip the patch and continue the rebase; but will the changes in PassengerContactHandler.java will be rebased into my branch? How should I proceed? Could it be that the file with the resolved conflict is exactly like the original version?

Tags (comma-separated) Cancel