FAQ Database Discussion Community


Mercurial undo a series of commits

mercurial,revert
I have a mercurial repo with the following history (most recent commit at the top) on a feature branch: mergeDefaultA | mergeDefaultB | C | mergeDefaultD mergeDefaultXXXX are merge commits that came as the result of merging the default branch into the feature branch. What has happened is commit C...

svn: How to revert somebody else's commit?

svn,tortoisesvn,revert
Argh, somebody (OK, my boss) added and commited all the files in his directory, meaning all the svn files: conf/, db/, format, hooks/, locks/... I'm using Tortoise, so I tried clicking on each one and doing revert, it said OK, but I still see all of them under version control...

Git reset and revert

git,merge,reset,revert
I have accidentally merged the wrong branch into master, and pushed to origin. The problem is, that i have resetted the masterbranch to the last before commit-hash with git reset --hard xxx and also the origin with git push origin master --force but now the merge-commit is always there. The...

GitHub revert conflict is not a conflict, and can't be resolved

git,github,revert,revision-history
I am trying to make a revert, and it is saying I have unresolved conflicts. This is very strange because the conflict points to a single comment line. <<<<<<< HEAD // END product configuration | clong ======= // END SVG Product Configuration | clong >>>>>>> parent of 4cd0889... prerevert, conflicts...

Git revert causes merge conflict

git,revert
I created a dummy txt file and entered a new line in every commit such as: //dummy.txt first commit second commit third commit now I want to get rid of the second line by reverting the second commit. However I receive merge conflicts in this simple experiment. Could somebody explain...

How can I re-merge commits that were reverted in github?

git,github,version-control,revert
I will try my best to concisely describe my current situation, and would be most grateful for some advice. I merged in a big feature branch of code this morning that turned out to have a critical error. In order to undo it, my coworker reverted the merge (which had...

Git - Change “origin commit” of a branch

git,workflow,commit,revert
I have some difficult to found a Git generic worflow to remove some commits (between 2 refs) from a branch ; here is a little example : My current state are like this : * a878646 (develop) C8a * 070acb7 C7a | * 7937ce7 (HEAD, F1) C9b | * fb4add2...

How can I commit/push changes to a “live” branch and then keep working on my “test/dev” branch?

version-control,mercurial,tortoisehg,revert
I'm very new to working on larger projects and using any form of version control, so please bear with me. I have a project running on a local/intranet webserver. I'm using mercurial for version control with hgworkbench/turtoisehg as a GUI. So far I've simply commited and pushed my changes to...

Default to original textarea val on Esc

jquery,textarea,keypress,var,revert
I'm trying to make an textarea default to the original value upon hitting esc. I can't seem to pass the origVal from the main code into the keypress if/else. Am I overthinking this or underthinking it? Fiddle: https://jsfiddle.net/kirkbross/brkbcr5c/1/ $(function() { var origVal = $("#textarea").val(); // set original value of textarea...