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

George M
seal-mask
.a{fill-rule:evenodd;}techdegree
George M
Full Stack JavaScript Techdegree Student 581 Points
Posted by George M
.a{fill-rule:evenodd;}techdegree
George M
Full Stack JavaScript Techdegree Student 581 Points

No matter how many times I try, I get "Your branch and 'origin/master' have diverged"

No matter how many times I try, I get "Your branch and 'origin/master' have diverged"

After doing a git fetch origin and then looking at git status I keep getting a message:

"Your branch and 'origin/master' have diverged, and have 2 and 1 different commits each, respectively."

Subsequently I get an error: "fatal: refusing to merge unrelated histories" when attempting to merge

I have looked at solutions but I can't seem to wrap my head around what I could be doing wrong

The video I'm referring to since treehouse is glitched out and won't let me post a question in the video's comments

https://teamtreehouse.com/library/remote-branches#questions

Please help!