Git Tips

Jump to bottom Edit New page

lschiff edited this page Sep 18, 2014 · 3 revisions

If you want to roll back a commit and you have not pushed it:

git reset --hard HEAD^

Revert changes to a file:--

git checkout - file

Resolving a conflict http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging If there are conflicts: resolve, merge, commit.

Push your changes to the cdlib/eschol-ojs repo on github:

git push