How do I revert all local changes in Git managed project to previous state

If you want to revert all changes AND be up-to-date with the current remote master (for example you find that the master HEAD has moved forward since you branched off it and your push is being ‘rejected’) you can use: # will fetch the latest changes on the remote git fetch # will set your… Read More How do I revert all local changes in Git managed project to previous state

Git tips and tricks:: How to undo a git merge with conflicts

Latest Git: git merge –abort This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes from before the merge, although it cannot always do so reliably. Generally you shouldn’t merge with uncommitted changes anyway. Prior to version 1.7.4: git reset… Read More Git tips and tricks:: How to undo a git merge with conflicts