Git merge did not go as expected

Question

Hello, I will try to be very practical in this my problem.

1 - Working on the 'fix' branch I ended up making changes to different things by mixing things up...

2 - Dai to try to 'improve' created a new child branch

git checkout -b correcao-banco

added the specific files of this new branch and commit!

3 - Dai back to the original branch

git checkout correcao

4 - I added the remaining files and commit!

Now my goal would be to bring to master only the fixes from the 'fix' branch and nothing from the 'fix-bank' branch'.

5 - I went to the master

git checkout master

6 - I checked the merge

git merge correcao

Dai happened a merge that was not happy because it gave a fast forward and brought the changes of the 'fix-bank' together...

Apparently this is the expected behavior but not for me... I didn’t understand and now? I’ve got a way back to get the changes out of the bank'?

Thank you.

Answer 1

The process you have executed is the correct one in your intention. As you can check in this example extracted directly from Git SCM. So what may have occurred is that the moment you returned to the branch correcao, have also led to some branch change correcao-banco.

About going back, it is possible to reverse the merge:

# Revertendo commit de merge
git revert -m 1 <merge_commit_sha>

Documentation for Git Revert.