Treehouse | Community | Merge Conflicts

Newest
- Newest
- Active
- Unanswered
- Featured
All Topics

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
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
joeboo2529
9,805 Points
Github “fatal: remote origin already exists”

Posted February 16, 2016 9:44am by joeboo2529

joeboo2529
9,805 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
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
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
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
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
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
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

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

Carlos Vieira

Carlos Vieira

Thomas Katalenas

Thomas Katalenas

joeboo2529

joeboo2529

Kelcey Wilson

Kelcey Wilson

Rachelle Wood

Rachelle Wood

rajbee

rajbee

JUSANG YOU

JUSANG YOU

Mathew Kurian

Mathew Kurian

Robert Mews

Robert Mews

Max Pedersen

Max Pedersen

sakatagintoki

sakatagintoki

liciabailey

liciabailey

Chaim Yunger

Chaim Yunger

Dan Szeezil

Dan Szeezil