GIT stuff

CREATING A FEATURE BRANCH FROM THE DEV BRANCH:

http://stackoverflow.com/questions/4470523/git-create-a-branch-from-another-branch

git branch -b <FEATURENAME> develop
git push origin <FEATURENAME>

-----------

integrating master->develop , or develop->feature
(rebase)

http://stackoverflow.com/questions/16955980/git-merge-master-into-feature-branch

git checkout feature1
git rebase master

Manage all conflicts that arise. When you get to the commits with the bugfixes (already in master), git will say that there were no changes and that maybe they were already applied. You then continue the rebase (while skipping the commits already in master) with

git rebase --skip

-----

rebasing correctly

git fetch
git checkout develop
git pull
git checkout <feature>
git rebase develop


git fetch does not update non-checked out branches by default

---

# Merge local branch foo into local branch master,
# without having to checkout master first.
# Here `.` means to use the local repository as the "remote":
git fetch . foo:master

# Merge remote branch origin/foo into local branch foo,
# without having to checkout foo first:
git fetch origin foo:foo




http://stackoverflow.com/questions/3216360/merge-update-and-pull-git-branches-without-using-checkouts


--------------

Rename Branch

Locally:

If branch checked out:
git branch -m <new_name>

Without branch checked out:
git branch -m <old_name> <new_name>

Remotely:

1) Delete the old branch, and push the local branch up to the new name:
git push origin :old-name new-name

2) Reset the upstream branch for the newly named local branch (with renamed local branch checked out):

git push origin -u new-name