This is correct... Falcon didn't have a develop branch, I only created that this morning. I then merged (locally) my changes on the 'master branch' into the develop branch, before pushing those out to the remote develop branch.
My intention was to leave the master branch untouched (as it was when it was added to git) and make all changes from now on on the develop branch, as per Gitflow. EdB On Fri, Mar 22, 2013 at 10:16 AM, Frédéric THOMAS <[email protected]> wrote: > Hi Erik, > It looks like you worked on the master and merged on the develop branch. > > -Fred > > -----Message d'origine----- From: Erik de Bruin Sent: Friday, March 22, 2013 > 8:14 AM To: [email protected] Subject: [FalconJx] ok, that was scary > Hi, > > I just pushed my outstanding commits to the 'develop' branch of > Falcon... at least, I think I did. Can someone please verify I did it > correctly? > > Thanks, > > EdB > > > > -- > Ix Multimedia Software > > Jan Luykenstraat 27 > 3521 VB Utrecht > > T. 06-51952295 > I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
