LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

minor typos

Jeremy Kauffman 2017-07-19 13:44:22 -04:00
parent ec7dbc7773
commit 0e1bf61193
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Branching-and-Merging.md

@ -1,4 +1,4 @@
Git history is similar to code in that it is written once but it is read dozens of times. Therefore we optimize for readability. It should be clear what happened, by whom, when, and ideally why. Git history is similar to code in that it is written once but it is read dozens of times. Therefore, we optimize for readability. It should be clear what happened, by whom, when, and ideally why.
## Start all work in a new branch off of master ## Start all work in a new branch off of master
@ -9,7 +9,7 @@ git checkout -b new_branch origin/master
## Rebase onto master daily ## Rebase onto master daily
This reduces merge conflicts in the future This reduces merge conflicts in the future.
``` ```
git fetch git fetch
@ -26,7 +26,7 @@ git rebase -i origin/master
git push -u origin your_branch_name git push -u origin your_branch_name
``` ```
*Tip: make lots of small commits as you work, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit* *Tip: make lots of small commits as you work, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit.*
## Rebase and non-ff-merge into master when you're done ## Rebase and non-ff-merge into master when you're done