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 Conflict Resolution

bahman sadeghi
bahman sadeghi
4,810 Points
Posted by bahman sadeghi
bahman sadeghi
4,810 Points

branch conflict

i copy and paste the first branch to the second but not yet solve the problem?

http://teamtreehouse.com/library/conflict-resolution

1 Answer

Phillip Gibson
Phillip Gibson
13,805 Points
Phillip Gibson
Phillip Gibson
13,805 Points

To resolve a git conflict, you actually have to remove all of the generated diff elements and leave only what you want the merge result to look like. That means you should remove the

<<<<<<< HEAD

and

=======
It pretty much can't ever resolve problems.
>>>>>>> pessimistic_branch

to solve the first challenge.