Report question

Question: Git: Changes keep getting lost due to seemingly random merges