Welcome to the Treehouse Community

Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.

Looking to learn something new?

Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.

Start your free trial

Development Tools Git Basics Merging Merge Conflicts

rajbee
rajbee
6,657 Points
Posted by rajbee
rajbee
6,657 Points

Resolving merge conflicts without editing files

You mentioned that merge conflicts can be merged by methods other than editing the files. Please tell us what those are. Thanks.

1 Answer

Steven Ventimiglia
Steven Ventimiglia
27,371 Points
Steven Ventimiglia
Steven Ventimiglia
27,371 Points

Git mergetool is one way. I personally prefer a more hands-on approach, because editing several merge conflicts can be a bit daunting at first, but in this case - if it's my own code or something I know isn't being changed without proper communication about the changes from the team I'm working with, there's a proper understanding of why the conflict(s) occured.

Atom.io is actually better at helping you edit conflicts than Sublime, imho (plus it's free.) But then again, it was created by founders of Github, which makes sense.

Here's some more info that could help:

http://stackoverflow.com/questions/161813/fix-merge-conflicts-in-git