Hi,
I was merging in a branch today and saw a (for me) unclear behavior.
So, what I did was:
git checkout master
git merge --squash _MY_BRANCH_
At this point I had a conflict. After fixing it I wanted to commit my
current state.
git add _CONFLICTED_FILE_
git commit
What happens now is that the squashed commit logs are replaced with the
Conflict
some/file/with/a/path
message.
Just to be sure I created a test repo and merged in a branch with the
--squash option. For this test I made sure no conflict would pop up.
After committing the merged state, as expected, every commit message
of the branch was set as the current commit message.
I was expecting the conflict message to be pushed to the front of the
squashed commit messages.
- Daniel
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html