why do files I didn't touch become merge conflicts after a pull
I was working on a branch. I made some changes to a file person.cs that I wanted to apply to a co-worker's branch. Last week I had been working on his branch, but lately I have been working on my own branch.
I switched to his branch and pulled to get his most recent changes. After the pull I got merge conflicts in people.css , a file that I had never even opened.
Why would I get merge conflicts?
链接地址: http://www.djcxy.com/p/45100.html上一篇: 了解rebase如何在git中工作