Treehouse | Community | Conflict Resolution

🤑 Join the Treehouse affiliate program and earn 25% commission!

Join our Live Career-Building Workshop: Launch Your Tech-Adjacent Career! ⭐ Register here!

🌟 Dreaming of a bright future? 🎓 Ask about the Treehouse Scholarship program! 🚀

Curious which AI tools Treehouse developers love? ⚙️ Check them out!

🫡 Treehouse for Military offers discounts to Veterans, service members and their families!

Newest
- Newest
- Active
- Unanswered
- Featured
All Topics

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
gregory gordon
Full Stack JavaScript Techdegree Student 14,652 Points
fatal: Not a git repository (or any of the parent directories): .git happened when i started the launch console.

Posted July 5, 2015 2:08am by gregory gordon

gregory gordon
Full Stack JavaScript Techdegree Student 14,652 Points
2 Answers
Satu Korhonen
3,360 Points
On what basis does Git resolve merge conflicts?

Posted June 11, 2015 7:33am by Satu Korhonen

Satu Korhonen
3,360 Points
2 Answers
JUSANG YOU
7,857 Points
Difference between git add and git commit.

Posted May 30, 2015 4:05am by JUSANG YOU

JUSANG YOU
7,857 Points
2 Answers
Mathew Kurian
4,698 Points
How come you can't autocomplete branch names with the TAB button?

Posted May 18, 2015 2:19am by Mathew Kurian

Mathew Kurian
4,698 Points
1 Answer
Robert Mews
11,540 Points
Confirming Merge was Succesful

Posted April 17, 2015 5:33pm by Robert Mews

Robert Mews
11,540 Points
2 Answers
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
Max Pedersen
7,196 Points
Can you combine flags using Git?

Posted March 22, 2015 7:27pm by Max Pedersen

Max Pedersen
7,196 Points
1 Answer
alexwood
3,909 Points
I'm... Branching... Out, I want the world to know gonna let these branches showwww I'm, branch-innnnggggg, out

Posted March 21, 2015 4:02am by alexwood

alexwood
3,909 Points
2 Answers
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
sakatagintoki
12,624 Points
Could not get Master branch and foo-feature branch to auto-merge in previous video. Now serious problems. D:

Posted January 13, 2015 12:33pm by sakatagintoki

sakatagintoki
12,624 Points
1 Answer
Jim Withington
12,025 Points
Git auto-merge didn't happen in the console

Posted October 24, 2014 1:39am by Jim Withington

Jim Withington
12,025 Points
5 Answers
Paul Neumyer
15,301 Points
When merging my commits on different branches in Termin I had to follow these instructions

Posted August 11, 2014 7:17pm by Paul Neumyer

Paul Neumyer
15,301 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
Christopher Borchert
14,814 Points
Automerge failed? Git is not using the recursive algorithm.

Posted July 27, 2014 4:01am by Christopher Borchert

Christopher Borchert
14,814 Points
4 Answers
liciabailey
Full Stack JavaScript Techdegree Student 4,353 Points
Commit Message after a conflict. How to commit when using VIM.

Posted July 17, 2014 11:12pm by liciabailey

liciabailey
Full Stack JavaScript Techdegree Student 4,353 Points
4 Answers
Chaim Yunger
314 Points
resources on rebasing

Posted May 6, 2014 3:57pm by Chaim Yunger

Chaim Yunger
314 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
Dan Szeezil
2,823 Points
Different merge conflict response

Posted March 6, 2014 4:08pm by Dan Szeezil

Dan Szeezil
2,823 Points
1 Answer
bahman sadeghi
4,810 Points
branch conflict

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

bahman sadeghi
4,810 Points
1 Answer

Prev Page 2 of 2 Next

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