Git how to merge conflict if want to use source or destination file only
When I am doing megring from source to destination branch, Lets say I got conflict in 5 files and I am sure I want to use source or destination branch, how to do this quickly.
In perforce i use the option accept target or accept source, to resolve merging conflict
链接地址: http://www.djcxy.com/p/45034.html上一篇: 如何解决git中的大量文件的合并冲突？