Learn Version Control with Git
Our beginner-friendly video course teaches you the foundations of Git - and takes you from novice to master!
Learn Version Control with Git featured image

Dealing with Merge Conflicts

How do I resolve a merge conflict?

Learn More

About Us

As the makers of Tower, the best Git client for Mac and Windows, we help over 100,000 users in companies like Apple, Google, Amazon, Twitter, and Ebay get the most out of Git.

Just like with Tower, our mission with this platform is to help people become better professionals.

That's why we provide our guides, videos, and cheat sheets (about version control with Git and lots of other topics) for free.

Download the Cheat SheetFree

Get 16 of our most popular Cheat Sheets in one handy ZIP!

Thanks! Please Check Your Inbox!

Want to win one of our awesome Tower shirts?
Tell your friends about the package!

Share on Twitter