Yes, that's what I want 在 2015年11月1日星期日 UTC+8下午8:26:13，Magnus Therning写道： > > On Sat, Oct 31, 2015 at 03:16:32AM -0700, Dayong Xie wrote: > > To be specific > > In my Unity project, there is a native plugin, and plugin's extension > > is .dll, and this plugin is under git version control, when Unity is > > running, the plugin file will be locked. If i merge another branch, > > which contains modification of the plugin, git will report error, > > looks like: > > > > error: unable to unlink old 'xxxxxxx/xxx.dll' (Permission denied) > > > > This is not bad, however, the unfinished merge action will not revert > > by git, a lot of changes produced in repository. usually it makes me > > crazy, even worse, some of my partners are not good at using git. Of > > course, this problem can be avoided by quit Unity, but not every time > > we can remember. > > > > In my opinion, git should revert the unfinished > > action when the error occurred, not just stop. > > If I understand you you'd like a merge strategy that resembled the > result of running `git merge --abort` after a failed merge. > > This request should be posted to the git developers list, see > <http://git-scm.com/community>. > > Thanks you, I'll post.