Treehouse | Community | Basic Merging

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

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

okilydokily

okilydokily

Andrew Izquierdo

Andrew Izquierdo

Simon Coates

Simon Coates

Seth Warner

Seth Warner

Adam Helzer

Adam Helzer

gregory gordon

gregory gordon

Jim Withington

Jim Withington

Paul Neumyer

Paul Neumyer

Christopher Borchert

Christopher Borchert