Deshacer un merge:
##El Merge que quiero desacer sera de tipo:
When you view a merge commit in the output of git log, you will see its parents listed on the line that begins with Merge:
commit 2d4a73f35bde24978c9a3122e18503a9078779b9 [2d4a73f]
Merge: 8989ee0 7c6b236
Author: Ben James <ben@example.com>
Date: Wed Aug 17 22:49:41 2011 +0100
##Ejecutar:
git revert 2d4a73f -m 1
##
- 2d4a73f = commit del merge que quieres deshecer entre []
- Para saber si poner 1 o 2, hacer click en el source tree en los numeros y elegir el que sea el commit al que quieres volver
//EXTRA: In this situation, git revert 2d4a73f -m 1 will get you the tree as it was in 8989ee0, and git revert -m 2 will reinstate the tree as it was in 7c6b236