Git: Changes keep getting lost due to seemingly random merges

Question

I have a feeling this will be an obvious answer, but I can\'t seem to work it out.

What appears to happen is that I commit/push some changes to the server and everything

Answer 1

If you are losing commits, ensure that neither of you is using --force or a force flag on your gui to get rid of rejected. Take a look at the explanation of the DAG.

http://progit.org/book

hope this helps.