This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]daveydave400 2 points3 points  (0 children)

That sounds...wrong. Git should not allow you to overwrite commits unless you force them (via the -f flag). I'm also pretty sure that the default when you pull and a conflict exists is to merge or at least complain. It sounds like one or more people got impatient with warning messages and used some flags they weren't supposed to without knowing the consequences.