Treehouse | Community | Conflict Resolution

Newest
- Newest
- Active
- Unanswered
- Featured
All Topics

Abdullahi Abdinasir Ali
9,520 Points
I remove pessimistic branch

Posted May 1, 2018 6:26am by Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali
9,520 Points
1 Answer
Abdullahi Abdinasir Ali
9,520 Points
What resolution should remove and persemetic problem

Posted April 30, 2018 2:30pm by Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali
9,520 Points
1 Answer
Abdullahi Abdinasir Ali
9,520 Points
What do I remove or keep in console

Posted April 24, 2018 3:53am by Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali
9,520 Points
2 Answers
Richard Lake
20,462 Points
Challenge impossible

Posted March 7, 2018 1:47pm by Richard Lake

Richard Lake
20,462 Points
1 Answer
Nobody Tebulo
13,233 Points
Resolve the second merge conflict however you'd like. Oops! It looks like Task 1 is no longer passing.

Posted September 4, 2017 10:55am by Nobody Tebulo

Nobody Tebulo
13,233 Points
1 Answer
Nobody Tebulo
13,233 Points
Resolve the second merge conflict however you'd like. Oops! It looks like Task 1 is no longer passing.

Posted September 4, 2017 10:55am by Nobody Tebulo

Nobody Tebulo
13,233 Points
0 Answers
Arvind Kevin Arjun Sharma
8,272 Points
Who can help me with the answer for this? i really don't know what to do in this task.

Posted July 3, 2017 10:52pm by Arvind Kevin Arjun Sharma

Arvind Kevin Arjun Sharma
8,272 Points
1 Answer
John Falato
1,885 Points
I'm in "https://teamtreehouse.com/library/conflict-resolution" and the editing function is not working.

Posted July 16, 2016 7:44pm by John Falato

John Falato
1,885 Points
2 Answers
Thurman Ward
2,718 Points
either there's an error in the question ..... or a poorly written question

Posted June 23, 2016 8:59pm by Thurman Ward

Thurman Ward
2,718 Points
1 Answer
MUZ140884 Maxwell Makumucha
6,291 Points
im stuck, how do we go about step 1. The video is a bit difficult to understand

Posted November 10, 2015 3:32pm by MUZ140884 Maxwell Makumucha

MUZ140884 Maxwell Makumucha
6,291 Points
0 Answers
Pablo Grippo
25,765 Points
I can't resolve the first merge conflict. Please help me!

Posted July 22, 2015 7:33pm by Pablo Grippo

Pablo Grippo
25,765 Points
1 Answer
Kudakwashe Chayerera
3,415 Points
Resolve the first merge conflict by accepting the HEAD version of the conflict.

Posted July 16, 2015 5:21pm by Kudakwashe Chayerera

Kudakwashe Chayerera
3,415 Points
1 Answer
Darwin Zone
7,303 Points
How to resolve the first merge conflict by accepting the HEAD version of the conflict.

Posted March 26, 2015 6:00pm by Darwin Zone

Darwin Zone
7,303 Points
1 Answer
Jonathan Musso
3,760 Points
Resolve the first merge conflict by accepting the HEAD version of the conflict.

Posted February 4, 2015 3:19pm by Jonathan Musso

Jonathan Musso
3,760 Points
0 Answers
codebully
2,306 Points
It's a bit unclear what the author wants here.

Posted August 3, 2014 2:43am by codebully

codebully
2,306 Points
1 Answer
PLUS

Ann Boen
Courses Plus Student 18,089 Points
Git Merging - I don't g(i)t (get) it!

Posted May 6, 2014 9:32am by Ann Boen

Ann Boen
Courses Plus Student 18,089 Points
3 Answers
bahman sadeghi
4,810 Points
branch conflict

Posted February 27, 2014 7:57pm by bahman sadeghi

bahman sadeghi
4,810 Points
1 Answer

Posting to the forum is only allowed for members with active accounts.
Please sign in or sign up to post.

Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali

Abdullahi Abdinasir Ali

Richard Lake

Richard Lake

Nobody Tebulo

Nobody Tebulo

Nobody Tebulo

Nobody Tebulo

Arvind Kevin Arjun Sharma

Arvind Kevin Arjun Sharma

John Falato

John Falato

Thurman Ward

Thurman Ward

MUZ140884 Maxwell Makumucha

MUZ140884 Maxwell Makumucha

Pablo Grippo

Pablo Grippo

Kudakwashe Chayerera

Kudakwashe Chayerera

Darwin Zone

Darwin Zone

Jonathan Musso

Jonathan Musso

codebully

codebully

Ann Boen

Ann Boen

bahman sadeghi

bahman sadeghi