[WIPz] wxPython Demo Converted To Phoenix-r74150 from wx2940

Ok installed TortiseGit
and
Git1.8.3

was getting error…cant push to Robins…hmm…
Ok this seemed to work.
pull from https://github.com/RobinD42/Phoenix
push to https://github.com/Metallicow/Phoenix

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…

Metallicow wrote:

Ok installed TortiseGit
and
Git1.8.3

was getting error...cant push to Robins...hmm...
Ok this seemed to work.
pull from GitHub - RobinD42/Phoenix: wxPython's Project Phoenix. A new implementation of wxPython, better, stronger, faster than he was before.
push to GitHub - Metallicow/Phoenix: wxPython's Project Phoenix. A new implementation of wxPython, better, stronger, faster than he was before.

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.

···

--
Robin Dunn
Software Craftsman

Robin Dunn wrote:

Metallicow wrote:

Ok installed TortiseGit
and
Git1.8.3

was getting error...cant push to Robins...hmm...
Ok this seemed to work.
pull from GitHub - RobinD42/Phoenix: wxPython's Project Phoenix. A new implementation of wxPython, better, stronger, faster than he was before.
push to GitHub - Metallicow/Phoenix: wxPython's Project Phoenix. A new implementation of wxPython, better, stronger, faster than he was before.

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):

   git checkout master && git pull upstream master && git push origin

···

--
Robin Dunn
Software Craftsman