Timeline for Git - Undo merging master branch into another branch
Current License: CC BY-SA 3.0
4 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jan 4 at 15:55 | vote | accept | SirloinStockade | ||
| Sep 13, 2017 at 7:31 | comment | added | Tal Joffe | there is no "seperating the master"... merge as I said is a commit at the end of the day. after the commit (merge) there is no more context of what got from master and what got there from the branch so I think you can't achieve what you are asking for. what you can do is to create a new branch from head, revert it to before merge, do git compare with the branch you started with and manually take the changes you want to keep. (If you are using Intellij this can be done quite easily.. probably on similar IDE's as well) | |
| Sep 7, 2017 at 15:21 | comment | added | SirloinStockade | Only problem is, I didn't realize the problem and made two commits after the merge, as seen in the image. Is there a way to keep the commits I made in the side branch while separating master from the side branch? | |
| Sep 7, 2017 at 14:33 | history | answered | Tal Joffe | CC BY-SA 3.0 |