How do I unmerge/remove a previously added branch from a base branch without deleting the merged branch?
Here is the scenario:
Long back I have merged a branch (x) to a base branch (b), since then I have many branches (y, z, ...) to b and have several commits and pushes. Now I need to remove the changes of x from b without deleting b. So that later if required I can merge that branch again and the changes of x are there in b after merge.
Is it possible or do I need to remove my changes in some other branch (o), which will override the changes of x in b.