Fixing conflicts

Screenshot of gitk

The more programmers working in the same piece of code, the more conflicts will occur. So fixing conflicts is a common task when programming. Like many other organizations, here at Watu we use git as our version control system. Today I’d like to share a not-so-known tool very useful for properly solving conflicts:

It will show you the commits in conflict from the different branches.

If you did’t know it, try it the next time you have a conflict and tell me how it was.

Leave a Reply