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!
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
Will Lam7,027 Points
Git confusion: "Updates were rejected because the tip of your current branch is behind"
Right now going through some stuff with One Month Rails' and facing an error where it says my "Updates were rejected because the tip of your current branch is behind".
I tried to git pull, but it says I have unmerged files
Patrick Cooney12,216 Points
stash your changes, pull down code, unstash changes, commit, push, boom. done.
Stefan Jansen8,974 Points
in your console just type
git pull --ff-only.
This will fast-forward your local copy of the branch so it's the same as the remote.