Skip to content

Instantly share code, notes, and snippets.

@BinaryMuse
Created December 8, 2010 22:49
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save BinaryMuse/734070 to your computer and use it in GitHub Desktop.
Save BinaryMuse/734070 to your computer and use it in GitHub Desktop.
# To just pull changes from Github, forcing Git to use your local changes for any conflicts:
git pull --strategy=ours origin master
# To completely update each of your Git repositories in one command (run this inside each repository):
git add . && git commit -m "Updating to current working version" && git pull --strategy=ours origin master && git push origin master
@burningTyger
Copy link

do you use this for moodle updates?

@BinaryMuse
Copy link
Author

No; these are just a couple commands I whipped up for a coworker new to Git who had messed up his repos somehow (I think it was when he switched OS's from Windows or had done something else very weird).

@burningTyger
Copy link

ok, but this makes sense when updating moodle via git :) not that I was going to meddle with php and get my hands dirty.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment