Git commit disappeared after merge
<p>I'm working on a project with some collaborators, each having a remote copy of the master branch, which may or may not be up-to-date with the origin master branch.</p>

<p>Suppose one of the collaborators has an out-of-date copy due to a commit <code>X</code>, commits some <code>Y</code> and tries to push it to the origin branch. It fails and the collaborator merges the changes and pushes again, this time successfully.</p>

<p>Now, when looking at the history of the repository, commit <code>X</code> cannot be found anymore, except the changes of it are now in another commit called <code>Merge branch 'master' of https://....</code>. </p>

<p>Is this normal behaviour of git? This makes tracking down changes hard. Is there something that can be done to avoid this issue?</p>

<p>Thanks in advance!</p>