The sequence of operations is
- Branch
- Do work on branch
- Master had commits by other people
- Rebase on master to "merge" in changes from master
- Do a merge into master
These steps I understand. But what if I want to reuse this branch in case there are some other changes later related to this branch?
- Master has commits by other people
- Rebase branch on master OR merge in master to branch ???
QUESTION
Should I do a merge or rebase?