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 Basic Merging

Posted by okilydokily
okilydokily
12,105 Points

What is a merge conflict? I know you've been talking about this but I still don't understand how separate commits can ..

conflict. Of course, different commits will be different from each other and even more so on different branches. Ok I think I've figure out that merging is more than just reverse branching(the first video really glosses over this) it's also about merging files together. But Okay... are the files only merged on the last commit of each branch or in multiple commits in the history?

1 Answer

jamesjones21
jamesjones21
9,260 Points
jamesjones21
jamesjones21
9,260 Points

Basically there is a merge conflict where the file on the repository has something that your file doesn't so therefore it may get wiped when you commit your recent changes, the file your trying to commit isn't up-to-date with the master copy, so all you would need to do is go to the master copy and locate the file you'll see <<<HEAD tags of where the conflict is, update it on how you see fit then git add . An then git commit -m "your update comments" in the master copy. All conflicts should then be resolved. If you are using VS Code it will tell you where your conflicts are an highlights the files.