masterbranch is always production-ready, deployable, 100% green test suite- New development is done on feature branches, with frequent rebasing onto master
- Clean commit history by preferring to rebase instead of merge (
git pullis configured to automatically rebase)
Edson Patricio edsonpatricio
edsonpatricio
/ gist:40cd5fa8a0e31674eb63730aeda382c1
Created
February 7, 2017 02:32
— forked from stuart11n/gist:9628955
rename git branch locally and remotely
This file contains hidden or 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 branch -m old_branch new_branch # Rename branch locally | |
| git push origin :old_branch # Delete the old branch | |
| git push --set-upstream origin new_branch # Push the new branch, set local branch to track the new remote |
edsonpatricio
/ simple-git-workflow.md
Created
November 17, 2015 12:55
— forked from leesmith/simple-git-workflow.md
Simple Git Workflow For Continuous Delivery
edsonpatricio
/ type-bounds.scala
Created
May 21, 2014 02:20
— forked from retronym/type-bounds.scala
This file contains hidden or 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
| class A | |
| class A2 extends A | |
| class B | |
| trait M[X] | |
| // | |
| // Upper Type Bound | |
| // | |
| def upperTypeBound[AA <: A](x: AA): A = x |