Edit - Stack Overflow

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

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?
– SirloinStockade
Commented Sep 7, 2017 at 15:21
1

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)
– Tal Joffe
Commented Sep 13, 2017 at 7:31

Add a comment |

Correct minor typos or mistakes
Clarify meaning without changing it
Add related resources or links
Always respect the author’s intent
Don’t use edits to reply to the author

create code fences with backticks ` or tildes ~
```
like so
```
add language identifier to highlight code
```python
def function(foo):
print(foo)
```
put returns between paragraphs
for linebreak add 2 spaces at end
_italic_ or **bold**
indent code by 4 spaces
backtick escapes `like _so_`
quote by placing > at start of line
to make links (use https whenever possible)
<https://example.com>
[example](https://example.com)
<a href="https://example.com">example</a>

formatting help »
answering help »

Collectives™ on Stack Overflow