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

Updated Branching and Merging (markdown)

Alex Grin 2017-07-19 12:41:46 -04:00
parent 5b7be33b14
commit 2329808d2e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Branching-and-Merging.md

@ -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, 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