- Define a branch and a tag that will be your
long-running-branch
and be stable. (i.e. long-running-branch-stable lrb) - Each developer working on the long running branch should do feature work on their own branch. (ie. robbdempsey/feature2)
- When you are ready to merge changes from a developer feature branch, Get the latest branches and tags from remote
git pull
- When someone else has merged, tagged and pushed to github/stash you will need to pull those changes local
- Merge in your changes
git checkout long-running-branch-stable
git merge --no-ff [my-branch]
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Verifying that +robbdempsey is my openname (Bitcoin username). https://onename.io/robbdempsey |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
var nonDate = 1438387200000 | |
var date2 = '2015-08-12' | |
var date1 = '2015-08-01' | |
var obj = Date.parse(date1) | |
var obj2 = Date.parse(date2) | |
console.log(obj) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
that I keep forgetting. | |
### checkout a remote branch | |
git fetch origin | |
git checkout -b {local branch name} {origin/remote branch name} | |
### list branches and their last commit | |
git branch -v -a | |
### delete remote branch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git fetch | |
git rebase origin/master | |
vs | |
git checkout master | |
git pull | |
git checkout mybranch | |
git rebase master |
I hereby claim:
- I am robbdempsey on github.
- I am robbdempsey (https://keybase.io/robbdempsey) on keybase.
- I have a public key ASBGv8EbZ-harvboFDrzLt-cmoIwSs7YBh88xDoWmDHmqwo
To claim this, I am signing this object: