branch - Git merge errors

ID : 10213

viewed : 39

Tags : gitbranchgit-mergegit-branchgit

Top 5 Answer for branch - Git merge errors

vote vote

98

It's worth understanding what those error messages mean - needs merge and error: you need to resolve your current index first indicate that a merge failed, and that there are conflicts in those files. If you've decided that whatever merge you were trying to do was a bad idea after all, you can put things back to normal with:

git reset --merge 

However, otherwise you should resolve those merge conflicts, as described in the git manual.


Once you've dealt with that by either technique you should be able to checkout the 9-sign-in-out branch. The problem with just renaming your 9-sign-in-out to master, as suggested in wRAR's answer is that if you've shared your previous master branch with anyone, this will create problems for them, since if the history of the two branches diverged, you'll be publishing rewritten history.

Essentially what you want to do is to merge your topic branch 9-sign-in-out into master but exactly keep the versions of the files in the topic branch. You could do this with the following steps:

# Switch to the topic branch: git checkout 9-sign-in-out  # Create a merge commit, which looks as if it's merging in from master, but is # actually discarding everything from the master branch and keeping everything # from 9-sign-in-out: git merge -s ours master  # Switch back to the master branch: git checkout master  # Merge the topic branch into master - this should now be a fast-forward # that leaves you with master exactly as 9-sign-in-out was: git merge 9-sign-in-out 
vote vote

85

Change branch, discarding all local modifications

git checkout -f 9-sign-in-out  

Rename the current branch to master, discarding current master

git branch -M master  
vote vote

75

as suggested in git status,

Unmerged paths:                                                                                                                                 (use "git add <file>..." to mark resolution)                                                                                                       both modified:   a.jl                                       both modified:   b.jl 

I used git add to finish the merging, then git checkout works fine.

vote vote

66

my issue was (master|REBASE 1/1)

this command worked for me

 git rebase --skip 
vote vote

51

I had the same issue when switching from a dev branch to master branch. What I did was commit my changes and switch to the master branch. You might have uncommitted changes.

And also you can try this git reset --merge as well. This can be used to resolve any conflicts and revert.

Top 3 video Explaining branch - Git merge errors

Related QUESTION?