Git Merge Tool: Gitonium +4

Have you ever needed to merge a long-living feature branch into the main repository? You may have been working on a new feature for a long time, and now it's time to integrate it with the main branch. While you were off coding on your part, someone else may have changed some code in the same places as you, or perhaps they did some refactoring and removed a function that you had modified on your branch.

It could be even worse, too: you're merging branches that other developers on the team have worked on. You must understand both sides of every conflict to solve this safely. You have to know who changed what, when, and why. Git knows, but it isn't helping. Gitonium makes it easy.

The purpose of Gitonium is to give you complete situational awareness when merging code. You'll step through the merge process, conflict by conflict, in a focused manner. Gitonium shows you the conflicting code and every Commit leading up to it on either side, starting from where the conflicting file diverged, letting you see who changed it, when, and why.

Gitonium saves you time, so you can merge your code and continue your day. You have more creative things to do, like actually building something. Be done with the administrative busywork and get back to making stuff.