It's time for another update on Gitonium. When I started this project a year ago, I said that merge conflicts was a central problem I wanted to solve. That was always the plan. Well, I'm happy to say I've reached that point. 🎉 I now have a smooth little Git client with all the components needed, plus some specially designed touches.