My master updated.
I assume I can safely sync my local master and branch copys now with master and progress forward again by commiting to my like I was doing before…?
Or should I just delete the old demo and library branchs and start a new ones…
My master updated.
I assume I can safely sync my local master and branch copys now with
master and progress forward again by commiting to my like I was doing
before...?
Or should I just delete the old demo and library branchs and start a new
ones...
Git and github could probably figure out what is new on a branch that has already been merged once via a PR in a normal workflow, and do the Right Thing, but since we've also got subversion in the workflow it would probably be best to start a new branch. That way having the commits from the prior PR ending up with new IDs after they come back from subversion will not confuse things for the new one.
I forgot to mention in my last email that this is the correct way to do it. This is why the guides suggest that you add a git remote for the upstream repository (RobinD42/Phoenix in this case) in addition to the default one that you get (origin) when you make your local clone. I often do it like this from the command-line (bash):