Dear list, today, we've experienced a strange merge. This is the commit (on GitHub): https://github.com/JohannesKlug/hummingbird/commit/fee2d86ea7754b51d67b59daaba860de5893349a
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, Johannes -- 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 git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
