Git: Undo a merge solution


# you are on the dev branch
git checkout master
git merge dev 
# here you've merged the dev branch into master but actually you wanted to perform a --no-ff merge
git reset --hard origin/master # to undo the above merge: reset the master branch to the pre-merge state
git merge --no-ff -m 'my custom merge message' dev # now you can perform the merge you actually wanted

To undo an already pushed merge, you have to "git reset --hard 'the preceding commit ID of your last push to the master branch'" and repush the newly created commit using the -f flag.

Comments

Post a Comment

Popular posts from this blog

Apple's evaluating a new JVM

To boost the Java performance on x64 Mac systems, Apple is evaluating a new Java VM  that is derived the BSD port. You can try the new JVM using the  -XXaltjvm=bsdserver VM args which is available in the recent JDK/JRE developer preview. Using this new VM may improve the Java performance and increase benchmark scores but performance drawbacks can be expected as well.
Read more

Tuning ext4 for performance with emphasis on SSD usage

The obligatory disclaimer: The more performance you gain, the more data integrity you loose! But if you want to tune something like a file system, I strongly assume that you know what you are doing :) These tips apply to all major Linux distributions like Fedora/Red Hat, OpenSUSE, and Ubuntu that are already using ext4 or are going to make ext4 their default file system. As write operations on Solid State Disks (SSD) are expensive the tips below are focused on SSD usage but also apply to HDD usage as well . My Ubuntu 9.04 Jaunty /etc/fstab after a fresh installation: [...] UUID=d818ddf9-ff01-e21a-a67d-3ceab43a9e2b / ext4 relatime,errors=remount-ro 0 1 UUID=0d339122-74e0-e0ea-805a-7879b1fa3172 /home ext4 relatime 0 2 [...] My tuned Ubuntu 9.04 Jaunty /etc/fstab : [...] UUID=d818ddf9-ff01-e21a-a67d-3ceab43a9e2b / ext4 noatime,barrier=0,nobh,commit=100,nouser_xattr 0 1 UUID=0d339122-74e0-e0ea-805a-7879b1fa3172 /home ext4 noatime,barrier=0,data=writeback,nobh,commit=100,nouser_xattr 0 2...
Read more