Re: [git-users] Git newbie not understanding branching and/or git flow

2011-10-28 Thread John Green
On Fri, Oct 28, 2011 at 4:48 PM, Chris Stone wrote: > Sorry about the short reply earlier I was on my phone. > What's going on here is when you did the clone it defaults to master. When > you did git flow init it created the develop branch for you. To get your > test file while on develop you need

Re: [git-users] Git newbie not understanding branching and/or git flow

2011-10-28 Thread Chris Stone
Sorry about the short reply earlier I was on my phone. What's going on here is when you did the clone it defaults to master. When you did git flow init it created the develop branch for you. To get your test file while on develop you need to perform a git merge origin/develop. If you did a fresh cl

Re: [git-users] Git newbie not understanding branching and/or git flow

2011-10-28 Thread John Green
On Fri, Oct 28, 2011 at 3:43 PM, Chris Stone wrote: > You need to git checkout develop after you clone unless you specify the > branch during clone > > Ok, I did miss that, but here's what happens. $ git checkout develop Already on 'develop' Of course I can do a checkout master and then a check

Re: [git-users] Git newbie not understanding branching and/or git flow

2011-10-28 Thread Chris Stone
You need to git checkout develop after you clone unless you specify the branch during clone On Oct 28, 2011 1:39 PM, "John Green" wrote: > I'm transitioning from svn to git and I'm having a bit of a problem. > I'm using git flow and I can't bring down changes I made. > > Here's what I've done. Fi