A unique tool to help you understand what is happening when you get conflicts in git merge, especially if you merge others’ branches. It aids you in selecting the correct code.
It also makes previewing changes and history easier and cleaner.
Use its visual help to rebase, undo, and amend a commit.
Features
For beginners and advanced git users
On the left: access to multiple repositories with a visual status of current rebase operation.
On the middle right: list of modified files for the selected commit.
On the bottom right: windows with possible views of the selected file's change.
Inspect a commit or conflict with all possible perspectives
Up to 12 configurable windows with different information about a commit.
Why Git Merger?
Understand others' commits
View commits and diffs with multiple perspectives to get the best image of a developer's intentions.
Reduce mistakes when merging and rebasing
It's much easier to resolve conflicts with visual help and constant access to the big picture.
Forget about git commands
You can use Git Merger for daily work with a git repository.
Undo with ease
Use one of the available commands to undo a commit or a file change.
Reorder commits with confidence
See the matrix of which files were changed in which commits to safely reorder commits for easier code review.
Roadmap
-
Improve UX.
-
Pull Request helper for Azure / GitHub. Get more information for faster code review.