Treehouse | Community | Conflict Resolution

⚡ 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

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
Natalia Modiano
3,410 Points
Git Commit Error: Vim: Caught deadly signal SEGV

Posted August 16, 2017 9:45pm by Natalia Modiano

Natalia Modiano
3,410 Points
0 Answers
PLUS

Carlos Vieira
Courses Plus Student 1,345 Points
Convert an old backup folder system into Git

Posted August 5, 2017 1:09am by Carlos Vieira

Carlos Vieira
Courses Plus Student 1,345 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
teamz
44,723 Points
Git Bash Issue on Windows: Moving from Notepad README back to bash command line

Posted July 30, 2017 8:42pm by teamz

teamz
44,723 Points
1 Answer
Sebastian Stephenson
1,310 Points
Please fill in the correct answer in each blank provided below

Posted July 28, 2017 11:51pm by Sebastian Stephenson

Sebastian Stephenson
1,310 Points
1 Answer
Devon Deason
7,061 Points
"There was problem with the editor"

Posted July 26, 2017 2:23am by Devon Deason

Devon Deason
7,061 Points
0 Answers
hunn chee
295 Points
Git is a ？version control system

Posted July 8, 2017 4:36pm by hunn chee

hunn chee
295 Points
2 Answers
hunn chee
295 Points
Where is stored git repository?

Posted July 8, 2017 4:28pm by hunn chee

hunn chee
295 Points
1 Answer
Mustafa Coban
1,036 Points
Why do we type "git push origin new_feature" if it already assumes origin when we don't type it.

Posted July 6, 2017 10:58pm by Mustafa Coban

Mustafa Coban
1,036 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
Kristian Woods
23,414 Points
Using the command line to use Git vs the Git app

Posted June 28, 2017 12:15pm by Kristian Woods

Kristian Woods
23,414 Points
1 Answer
nico dev
20,364 Points
"fatal: cannot mkdir myRepName: Permission denied"

Posted June 18, 2017 8:38am by nico dev

nico dev
20,364 Points
2 Answers
Don Shelby
12,047 Points
Console says notepad is not installed. When I follow the instructions "sudo apt...", it gives me an error.

Posted June 10, 2017 2:21pm by Don Shelby

Don Shelby
12,047 Points
1 Answer
ZoDo .
13,135 Points
fatal: 'C: /Users/Lorenzo/our_clone' is not a valid remote name

Posted June 10, 2017 12:57pm by ZoDo .

ZoDo .
13,135 Points
1 Answer
Jaspal Singh
13,525 Points
Git clone - Error message of please make sure of correct access rights

Posted June 5, 2017 11:27pm by Jaspal Singh

Jaspal Singh
13,525 Points
2 Answers
Christopher Niblett
751 Points
Team Treehouse password isn't working in the Team Treehouse console when prompted for it using sudo apt-get install git.

Posted June 4, 2017 11:44pm by Christopher Niblett

Christopher Niblett
751 Points
1 Answer
Max Pinomaa
2,647 Points
Git stopped working. "fatal: bad config line 1 in file /Users/username/.gitconfig"

Posted May 31, 2017 2:50pm by Max Pinomaa

Max Pinomaa
2,647 Points
4 Answers
Andres Ramirez
18,094 Points
Too fast...

Posted May 31, 2017 12:08am by Andres Ramirez

Andres Ramirez
18,094 Points
2 Answers
PLUS

Jordan Powell
Courses Plus Student 5,410 Points
Why did it show me the updates

Posted May 27, 2017 10:27pm by Jordan Powell

Jordan Powell
Courses Plus Student 5,410 Points
1 Answer
ammarkhan
Front End Web Development Techdegree Student 21,661 Points
Is git on our system is origin or remote?

Posted May 14, 2017 8:46pm by ammarkhan

ammarkhan
Front End Web Development Techdegree Student 21,661 Points
1 Answer
Owa Aquino
19,277 Points
Fatal error is displayed when pushing changes in from my Master branch to the remote repository.

Posted May 12, 2017 8:23am by Owa Aquino

Owa Aquino
19,277 Points
1 Answer
Keith Ostertag
16,619 Points
Tab completion not working for git checkout on command line?

Posted May 5, 2017 3:06am by Keith Ostertag

Keith Ostertag
16,619 Points
0 Answers
Domagoj Kirigin
16,392 Points
Cannot use Git -bash console: Permission denied

Posted April 7, 2017 7:37pm by Domagoj Kirigin

Domagoj Kirigin
16,392 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
Learning coding
Front End Web Development Techdegree Student 9,937 Points
How does he change screen after 45 seconds?

Posted March 30, 2017 7:28am by Learning coding

Learning coding
Front End Web Development Techdegree Student 9,937 Points
2 Answers
Fahmi Eshaq
3,002 Points
"1 deletion(-)" keeps showing up even though the folder is BRAND NEW with no files deleted yet. Why?

Posted March 29, 2017 10:19am by Fahmi Eshaq

Fahmi Eshaq
3,002 Points
1 Answer
Ole Vølund Skov Mortensen
27,842 Points
Am i right if git checkout moved my files to a previous commit?

Posted March 22, 2017 8:49pm by Ole Vølund Skov Mortensen

Ole Vølund Skov Mortensen
27,842 Points
1 Answer
Tracy Excell
Front End Web Development Techdegree Graduate 15,333 Points
Git Bash error, help understanding what is going wrong

Posted March 8, 2017 9:48pm by Tracy Excell

Tracy Excell
Front End Web Development Techdegree Graduate 15,333 Points
1 Answer

Prev Page 3 of 18 Next

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