Git Branch newbie - How to reverse?

git git-branch git-revert
MEM picture MEM · Apr 27, 2011 · Viewed 22.4k times · Source

Not sure if this is a proper way to work with branches.

  • I had this application on structure A.
  • I created a branch Z while I was on that structure A (but I kept my self on the master branch working).
  • While working (on the master branch), I changed that structure and I end up messing the all thing. :)
  • I've never commit nor added those new files to the rep.

Request:

  • I need to revert to the structure existing on the last commit. Revert All Uncommitted changes and also remove new files and folders that may have been added.

How can this be done?

Answer

Dan Breen picture Dan Breen · Apr 27, 2011

If you created a separate branch that got messed up, all you need to do is switch back to the one you were on before: git checkout A (assuming A is the name of the branch you were on... or maybe it's master).

You can delete the bad branch later, if you want, with git branch -d <branchname> and maybe throw in a -f too, if there are unmerged commits.

Edit: If your repository contains lots of bad changes you want to remove, you can use git reset --hard HEAD to undo them. If there are new files (not tracked by git), git clean -fd will remove them all. Obviously, use with discretion as they will not be recoverable by git.

Related questions

How do I delete a Git branch locally and remotely?

I want to delete a branch both locally and remotely. Failed Attempts to Delete a Remote Branch $ git branch -d remotes/origin/bugfix error: branch 'remotes/origin/bugfix' not found. $ git branch -d origin/bugfix error: branch 'origin/bugfix' not …

Read More
How do I push a new local branch to a remote Git repository and track it too?

I want to be able to do the following: Create a local branch based on some other (remote or local) branch (via git branch or git checkout -b) Push the local branch to the remote repository (publish), but make it …

Read More
How do I clone a specific Git branch?

Git clone will behave copying remote current working branch into local. Is there any way to clone a specific branch by myself without switching branches on the remote repository?

Read More