Conflict, it is necessary Merge, there is no conflict it is not called Merge.
The process of writing code, many people work together, conflict is inevitable, of course, and he is likely to conflict with their own, do not say you have not encountered before, how to do it? git to our solution is to use mergetool, what if no special installation, the default merge tool is vimdiff,
Look after the open is:
Vim default configuration can be modified, is more commonly used control + w to switch windows,: wqa clear the cache and save your changes. Of course, if your project is large or in practice, may be a lot of conflict, vimdiff can not meet the demand (in fact, the vast majority is enough), then merge Kaleidoscope is a good tool, you need to pay more than five hundred for life, not expensive.
This article is short, I write this article the aim is to remind you not to forget or ignore these gadgets, they are, in most cases, is a very good and efficient, but also to quickly and easily than the more powerful tools you may also have some other tools to resolve conflicts, clarify the situation, in combination, in order to maximize efficiency.