Phantom git merge conflict #3161
Description
git
In the "Conflicts, merging and rebasing" part of the exercise we are first asked to "Start by merging the changes from the main branch into the greet branch". This makes both branches point to the same commit. We are then asked to change hello.sh in the main branch. Afterwards we have to merge main into greet. The exercise expects us to have to handle a merge conflict at this point "Attempt to merge the main branch into greet. Bingooo! There you have it, a conflict.". There is no conflict, it is a simple fast-forward.