AWESOME way to resolve Git merge conflicts

May 18, 2016

One of my team members today discovered this:


In a large software engineering team, git merge conflicts are almost unavoidable (i.e. trying to avoid them is just not time-efficient).

You can’t really keep merge conflicts from arising.

What you can control is how you resolve them.

The headache that I can avoid with this tool, IMO, is worth the $5/month price tag. At least for my team 🙂

Get it here:

Note: I am not affiliated with gitkraken or its developers. I just found to it to be an awesome tool.


Ryan Harijanto

Head of Engineering. Former Sr. Engineer @Netflix , @HotelTonight , @Shutterstock. Previously a Senior Systems Engineer at Netflix, currently technology advisor and board member for emerging companies. Diverse technological knowledge and understanding of various industries.

Leave a Reply

Your email address will not be published. Required fields are marked *