tmschl
commented
11 years ago Haha, okay so
git initgit push remote origin http...- So bam the repo is initialized and we're ready to go
- You clone it
- I go
git branch development - I go
git checkout development - I go
git push origin development - Now there are 2 branches master and development
- I go
git branch lookup - I go
git checkout lookup - First feature branch
- And lookup is what development was
- I start working
- I COMMIT 80000000928340918 TIMES. EVERY TIME SOMETHING IS WORKING (you left that out, will bite you hard if you don't)
- I finish feature
- I go
git checkout development - Now I'm back on dev branch - Changes are still only on my feature branch
- Then to make sure dev is up to date i do
git pull origin dev git fetchwill tell you if it's not up to date but it wont actually update, i usuallyfetchbefore Ipull- Once my local dev is for sure up to date, I go
git merge lookup - So i just merged my feature into my local dev branch
- I go
git push origin development
To summarize. You are always working on a feature branch. Whenever you are on your local dev branch it will be to pull changes that have happened remotely i.e. make sure your local branch is up to date with the remote one. The only other time you will be on it is to merge your feature branches into it.
Make sense? It's tricky, and really you just have to play with it.
robbschiller
Dude.
So, I made the local develop branch and did some work on it getting Grunt setup and trying to use the Grunt task for compiling sass. I don't know if I fully understand the how I'm supposed to use the branches quite yet. Here's how it sits in my head.
Step by step.
developbranch withgit checkout developLookupgit branch lookupgit checkout lookuplookupfeaturedevelopbranchgit checkout developlookupbranch into developgit merge lookupI don't really get what is supposed to happen from there because that's where my understanding ends...