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:48:58 -04:00
parent c89ef7134a
commit 5c0ab8569a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Branching-and-Merging.md

@ -31,6 +31,8 @@ git push -u origin your_branch_name
## Rebase and non-ff-merge into master when you're done ## Rebase and non-ff-merge into master when you're done
We want a merge commit present for all code merged from PRs, even if that PR is only one commit. The merge commit documents that the merge came from a PR. This helps us differentiate between commits to straight master.
``` ```
git fetch git fetch
git rebase origin/master git rebase origin/master