On Sat, 2017-01-28 at 12:53 +0100, Eduard Braun wrote:
Do I understand correctly, that you re-wrote history and Maren merged her branch which was based on a former checkout with the original history? In that case it's not surprising you'll have the original history and your re-written history side-by-side.
However this could have probably been fixed by simply rebasing Maren's changes on the then latest version of the repository.
No, the history needed to be rewritten because Maren had a bad email address that could exist on yahoo but which didn't. So it changed, but in doing so it interacted with origin and duplicated the history instead of over-writing it.
In either case this should not happen during "normal" operation, right? Rewriting history is an absolute no-go for public repositories (which is why we have append-only branches in Bazaar) and once the migration is complete I hope nobody will ever fiddle with history again.
That's right. I don't expect it to do this often (or at all). There is an option in GitLab to select rebasing or merging as the preferred method, but merging should be ok for us. Default branches in projects are protected anyway, although not against duplicate merges.
Good to know from other git users that this is super rare.
Best Regards, Martin Owens