Though to be honest, I don't really like that behaviour either, since I usually end up resolving the conflict, staging the file to mark it resolved, and then un-staging it again.
Our of curiosity, what is your VCS of choice? As far as I can tell, everyone always hates the one they use :-)
![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
timeasmymeasure
no subject
Date: 2015-11-12 03:08 pm (UTC)Though to be honest, I don't really like that behaviour either, since I usually end up resolving the conflict, staging the file to mark it resolved, and then un-staging it again.
Our of curiosity, what is your VCS of choice? As far as I can tell, everyone always hates the one they use :-)