I had the following situation:
-----O
|
master
branch1
then I had to make some changes to master:
-----O-----O-----O
| |
branch1 master
now I want branch1 to be at the same point of master (and therefore to contain the commits I made):
-----O-----O-----O
|
master
branch1
I don't know if a merge would be the correct way to achieve this. what steps should I take?
EDIT: also consider that I have uncommitted changes that should be committed on branch1 after branch1 is up to date with master. so I need the current changes to be left untouched to be committed later on branch1