Git changes being lost - why?

Question

Our development team is using git and we\'ve lost changes to files at least twice recently. We are using private Github repos.

In the current case, we can go back throug

Answer 1

My guess is that there are different configuration among committers, perhaps someone is missing an autocrlf configuration.

Git somehow considers completely different two revisions of the same file, thus overwriting the old one with newer changes from another branch.

If a three-way merge (default recursive one) finds two completely different childs (ie because of CRLF misconfiguration) the merged result will be the most recent one, with no conflicts.