today, we've experienced a strange merge. This is the commit (on
It was supposed to merge two concurrent developments on the master
branch, and there was a conflict in one file to be resolved. The merge
commit, however, seems to have affected every single file!
We have no idea how this happened or how to resolve it.
Thanks for any pointers,
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at