git fetch --all
git checkout sprint015
git pull origin sprint015
git checkout -b my-new-feature
git add .
git commit -m "all my feature"
git checkout sprint015
git pull origin sprint015
git checkout my-new-feature
git rebase -i sprint015
git push origin my-new-feature
if you happen to have already pushed to my-new-feature before you rebase you will need to:
git push -f origin my-new-feature
because that is rewriting history, put in pull request
artem +1
git checkout sprint015
git merge --no-ff my-new-feature
git push origin sprint015
git branch -D my-new-feature
git push origin --delete my-new-feature
on master
git fetch
git checkout -b spring016 origin/master
git push origin sprint016 #this pushes the newly created branch to remote via github. refresh browser and have a look.
this is a test. it's only a test. bascially, create a test branch and merge all 100+ commits to see if shit is working, or the app is broke.
git checkout master
git checkout -b test-merge
git merge sprint015