Treehouse | Community | Basic Merging

⚡ CYBER NOVEMBER SALE ⚡ 50% off any plan for 6 months, exclusive to new subscribers.

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

Newest
- Newest
- Active
- Unanswered
- Featured
All Topics

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 ..

Posted November 8, 2018 5:27am by okilydokily

okilydokily
12,105 Points
1 Answer
Andrew Izquierdo
3,212 Points
After you merge a branch onto the master branch, do you ever want to continue working with that branch?

Posted July 18, 2018 12:12am by Andrew Izquierdo

Andrew Izquierdo
3,212 Points
1 Answer
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
PLUS

Carlos Vieira
Courses Plus Student 1,345 Points
How can we resolve a merge conflict if file is not a text or code?

Posted August 4, 2017 1:25am by Carlos Vieira

Carlos Vieira
Courses Plus Student 1,345 Points
1 Answer
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
Simon Coates
28,695 Points
git automerge sounds deeply fraught

Posted April 5, 2017 9:52am by Simon Coates

Simon Coates
28,695 Points
2 Answers
Simon Coates
28,695 Points
How does merging work?

Posted April 5, 2017 9:04am by Simon Coates

Simon Coates
28,695 Points
1 Answer
shalini khullar
9,592 Points
Launch Console not working

Posted February 14, 2017 12:15pm by shalini khullar

shalini khullar
9,592 Points
1 Answer
Thomas Katalenas
11,033 Points
I couldn't find .git/MERGE_HEAD

Posted August 11, 2016 9:10pm by Thomas Katalenas

Thomas Katalenas
11,033 Points
0 Answers
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
Thelma Boamah
15,726 Points
I don't understand when you use the -a flag while committing to Git? Can someone please explain?

Posted April 16, 2016 2:25am by Thelma Boamah

Thelma Boamah
15,726 Points
3 Answers
joeboo2529
9,805 Points
Github “fatal: remote origin already exists”

Posted February 16, 2016 9:44am by joeboo2529

joeboo2529
9,805 Points
0 Answers
Seth Warner
5,348 Points
At the end of the video "Basic Merging" with Tommy Morgan, git had to resolve an issue, can someone..

Posted February 7, 2016 7:56pm by Seth Warner

Seth Warner
5,348 Points
0 Answers
Kelcey Wilson
15,738 Points
Getting error: merge: README - not something we can merge

Posted December 23, 2015 2:32am by Kelcey Wilson

Kelcey Wilson
15,738 Points
2 Answers
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
Rachelle Wood
15,362 Points
Conflict Merging with Text Files in Windows Version of Git

Posted September 27, 2015 3:33pm by Rachelle Wood

Rachelle Wood
15,362 Points
0 Answers
rajbee
6,657 Points
Resolving merge conflicts without editing files

Posted September 25, 2015 9:31pm by rajbee

rajbee
6,657 Points
1 Answer
Adam Helzer
1,279 Points
I missed something in the Basic Merging tutorial.

Posted September 11, 2015 3:39pm by Adam Helzer

Adam Helzer
1,279 Points
1 Answer
muz141018susanmusonza
3,695 Points
simple merge

Posted August 21, 2015 7:25am by muz141018susanmusonza

muz141018susanmusonza
3,695 Points
1 Answer
Abe Layee
8,378 Points
I need help with this. I don't understand what I am being asked to do

Posted August 4, 2015 7:44pm by Abe Layee

Abe Layee
8,378 Points
4 Answers
Ramona Nichols
9,036 Points
Where are the movie snippets you used to show between courses? Treehouse Island or something? They were fun.

Posted July 25, 2015 7:14pm by Ramona Nichols

Ramona Nichols
9,036 Points
1 Answer
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

Prev Page 1 of 2 Next

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