Git merge errors

Question

I have a git branch called 9-sign-in-out with perfectly working code  and I want to turn it into the master  I m currently on the master branch     git branch 9-sign-in-out   master   I m trying to switch to 9-sign-in-out branch  but it doesn t allow me to     git checkout 9-sign-in-out app helpers application helper rb  needs merge config routes rb  needs merge error  you need to resolve your current index first   Any idea how can I ignore all the master branch errors and turn the 9-sign-in-out branch into the master  Maybe git rebase  But I don t want to lose the code in 9-sign-in-out branch

User · Answer

git commit -m  Merged master fixed conflict

User · Answer

my issue was  master REBASE 1 1   this command worked for me   git rebase --skip

User · Answer

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

User · Answer

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

User · Answer

as suggested in git status   Unmerged paths                                                                                                                                   use  git add  lt file gt      to mark resolution                                                                                                        both modified    a jl                                       both modified    b jl   I used git add to finish the merging  then git checkout works fine

User · Answer

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

[git] Git merge errors

Examples related to git

Examples related to branch

Examples related to git-merge

Examples related to git-branch