[linuxtools-dev] Git Merging

[Jeff Johnston <jjohnstn@xxxxxxxxxx>]

Recently a number of files I had pushed to our remote repository were 
deleted when I did a merge.  What appears to have happened is that 
someone else performed their own merge in-between and must have removed 
the new files from the staging area after a conflict occurred (e.g. git 
reset fileX).

If you see added files when you do a merge, do not remove them from the 
staging area.  If you do so and push, a subsequent merge by others will 
delete those files.

-- Jeff J.