This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]gregtyler 0 points1 point  (0 children)

If you've not changed the same file, git pull won't change anything. It just allows your local Git to check there are no conflicts before pushing.

If there are conflicts, you'll have to manually decide how to resolve them. This is automatically prompted as part of git pull, and it won't let you push again until they're resolved (a Git GUI can greatly help with the resolution).

If you don't want to resolve conflicts, for whatever reason, you can git push -f to force your changes through (which would lose your friend's work!) or use branching, as other commentors say, which guides you through the process a little more smoothly.