问题
I am having two branches names as master and develop. Both branches consist of some files in it. When I merged develop to master, one of my file got deleted. I don't understand how it got deleted when I didn't put any delete command. I am using git version: 1.9.5.msysgit.1 and Windows 8.
回答1:
When the branch develop removed this file after it branched off, then a merge of develop into your line (e.g. into master) would introduce this effect there as well.
来源：https://stackoverflow.com/questions/29764609/while-merging-two-branches-my-files-are-getting-lost