Let’s say you have these N sucessive commits: 1, 2, 3 and 4. If you select the commit 2 and choose “Revert to this revision”, your working copy will contain the changes brought by commits 1 and 2. Commits 3 and 4 will be “canceled”. If you select the commit 2 and choose “Revert changes … Read more
You use cvs update -C filename
To undo a merge that was NOT pushed: git reset –merge ORIG_HEAD If during the merge you get a conflict, the best way to undo the merge is: git merge –abort
The Subversion working copy performs quite badly when there’s a huge number of directories, like in your case. For write operations (even only locally) to the working copy, the working copy has to be locked, which means that a lock file is created in every directory (that’s 11k file creates), then the action executes, and … Read more
You can use git revert with the –no-commit option. In your example: $ git revert –no-commit b49eb8e 1d8b062 # Files that were modified in those 2 commits will be changed in your working directory # If any of those 2 commits had changed the file ‘a’ then you could discard the revert for it: $ … Read more
There are several ways to do that. But do not just update to the earlier revision as suggested here. The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard … Read more
git revert just creates a new commit — you can “remove” it with git reset –hard HEAD^ (be more careful with it, though!)
Check out svnadmin dump/load. It creates a text file with every version of your files. It may be possible to delete everything above/below a certain point and re-import it. See for instance Migrating Repository Data Elsewhere
You can do: git revert abcd123 git revert –no-commit wxyz789 git commit –amend … and then write an appropriate commit message describing the combined effect of reverting both commits.
Just revert the revert. So by clicking the revert button you will have created a new PR (your step 2). Once this is merged, you will have the option to revert this, which will create a new branch with all your changes back in. You can then pull this, make changes to it (if needed) … Read more