Welcome to the Treehouse Community

Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.

Looking to learn something new?

Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.

Start your free trial

Development Tools

Posted by Fran M
Fran M
20,141 Points

Git Basics | Challenges

Code Challenges: Conflict Resolution & Remote Work

Conflict Resolution

An inline image alt text

Bummer! You didn't get rid of pessimistic_branch's comment in the first conflict we don't want to keep that one.

Another solution tested to resolve conflict was to remove first and second >>>>>>HEAD including all branch's comments which resorted to

Bummer! We need to keep >>>>>>HEAD and remove pessimistic_branch's comment first. Which now when retested on 8/23/14 shows the error as the initial inline image above...

An inline image alt text

This may be an ITT issue but I'm not sure at this point as I've been able to pass other challenges in GIT Basics.

Remote Work

An inline image alt text

Bummer! You've got the right command, but the address isn't there correctly. Double check that you've got the right address.

So, everything is this challenge seems to be correct except for the 'address' wont pass which I am not sure if it is a ITT issue again, I was able to pass 2 of the 4 challenges and other task challenges from Git Basics. Is there another way to bypass the 'address'? I tried to reformat the url link to git@[url].git. with no luck.

Help, please.

Edited for Treehouse Support team via email guides to what steps to initiate before the process of Support team.

1 Answer

kirkbyo
kirkbyo
15,791 Points
kirkbyo
kirkbyo
15,791 Points

For the Conflict Resolution question it wants you to keep the head version and delete the other version and remove the head tags. So your text should look something like this

This is a text file! It's a fun little text file - it never really did anything to hurt anyone.

The only problem with our fun little text file is that it has conflict resolution issues.

It tries its best to resolve problems on its own.

Whenever it runs into a problem, it asks other people for help.

Maybe you can help it resolve its issues?

You simply forgot to remove the dot at the end of the link.

git remote add tommy http://tommysgitstuff.com/git_basics/cool_stuff.git

I hope this helped :)

Ozzie

Fran M
Fran M
20,141 Points

That was it (smh) thank-you.