----- Original Message ----- 
  From: Dayong Xie 
  To: Git for human beings 
  Sent: Saturday, October 31, 2015 10:16 AM
  Subject: [git-users] When a file was locked by some program, git will work 

  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 
  If i merge another branch, which contains modification of the plugin, git 
will report error, looks 
  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.
I believe you can set the file type in .gitattributes and can set the mergetool 
in the config, and crete your own custom merge driver, so that you can easily 
code the method you want. You will need to check the manual for details (I'm 
currently travelling).


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to