git：rebase（合并后）只给出冲突

Question

I have the following situation

• created a branch 'dev'
• worked on 'dev'
• worked on 'master'

At some point I want to merge my work from 'dev' into master

$> git checkout master
$> git merge dev

Thats no problem, but now I would like to continue working in branch 'dev'. However, 'master' has some commits which are not yet in 'dev', so I tried to rebase.

$> git checkout dev
$> git rebase master

This doesn't work and only gives conflicts. Solving the conflicts doesn't work, because after that there are more conflicts. Is there an explanation for this ?

Answer 1

It is a little bit unclear what you want to achieve. At the beginning you wrote:

At some point I want to merge my work from 'dev' into master

Then you wrote:

However, 'master' has some commits which are not yet in 'dev', so I tried to rebase.

If you want to get the work from dev into master you should

1. git checkout master
2. git rebase dev
3. solve conflicts if needed
4. git rebase --continue

Then you can go back to dev branch with git checkout dev

If you want to do it the other way, just switch the names I personally think that running git rebase --continue is the key to your problem.

PS: Instead of rebasing, try to consider running a git merge in this case.

Answer 2

The only reasonable way to get the changes from master back into dev after you have merged dev into master is by merging master into dev, not rebasing dev on top of master.

Rebasing is usually only used on branches that haven't been merged into anything yet.