Question

Given this Git tree:

(same description, same commit)

why Git produces a conflict if I execute this?

git checkout bugs
git rebase es-dev

I believed that if the same commit exists in two branches, when Git rebases one branch into other, simply ignores the commit in the branch being rebased. But it seems that’s not the case, because es-dev contains exactly the same commits than bugs and I get a conflict. In this case I can just do a:

git checkout es-dev
git branch -D bugs
git checkout -b bugs

but in more complex cases it could be a problem… (i.e. if I have commits in bugs that don’t exist in master or es-dev)

Answer 1

The branch bugs contains different commits than the branch es-dev. Otherwise, the graphic would look different.
The commits may contain the same changes, but the commit hashes are different making them different commits.

In your scenario, you can simply reset bugs to es-dev:

git branch -f bug es-dev