A git workflow question.
I have two branches (forked from the same point off master): feature/one and feature/two.
Both have been merged into master, and subsequent changes have been made to master.
Now I want to make more changes to feature/two, but I want my new changes to include the latest version of master.
This is what I do, but I'm not sure it's right:
$ git checkout feature/two
$ git rebase master
$ git pull origin master
Now I have all the changes, but I just merged in from master, and when I merge those changes back into master (once I'm done), I'm worried I'll get an insane tree like this again: https://pbs.twimg.com/media/Bdx0H_DIAAA1dGA.png:large
Is this workflow wrong, should I just create a new branch or something magically and otherwise?