Git Merge Tool: Gitonium 4+
Resolve any Conflict
Allsidium AS
-
- $39.99
Screenshots
Description
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.
What’s New
Version 2024.11.2
When someone reindents some code, you can toggle white space rendering in diffs, and focus in on just the actual changes.
Ratings and Reviews
Automated commits to Git, time saver!
Update:
Local LLM via Ollama seems to be present, but whichever model I choose, the app crashes before the commit message is generated. OpenAI works just fine. Please fix!
Original Review:
This app worked for a few months, and now it is crashing on every launch, which means it is utterly unusable!
The developer has not made much changes to the app since my purchase, and the features requested in-app were sitting still.
@Dev - if you're reading this, please do something about the crash, and the features requested in-app, using your wish list command.
Developer Response ,
Hi There, I'm sorry to hear you have a crash. I found the crash report and fixed it. You can now update to version 2024.6.1, which should resolve the issue for you.
As for the feature requests, they are coming very soon!
Great!
It makes me look pro without the effort!
App Privacy
The developer, Allsidium AS, indicated that the app’s privacy practices may include handling of data as described below. For more information, see the developer’s privacy policy.
Data Not Linked to You
The following data may be collected but it is not linked to your identity:
- Identifiers
- Usage Data
Privacy practices may vary, for example, based on the features you use or your age. Learn More
Information
- Seller
- Allsidium AS
- Size
- 14.9 MB
- Category
- Developer Tools
- Compatibility
-
- Mac
- Requires macOS 14.0 or later.
- Languages
-
English
- Age Rating
- 4+
- Copyright
- © 2024 Allsidium AS
- Price
- $39.99
Supports
-
Family Sharing
Up to six family members can use this app with Family Sharing enabled.