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

Updated Branching and Merging (markdown)

Alex Grin 2018-07-12 13:11:23 -04:00
parent 186beff01a
commit 0d4070fb22
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

@ -33,7 +33,7 @@ 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 properly rebased and only a single commit. The merge commit documents that the merge came from a PR. This helps us differentiate between commits to straight master. We want a merge commit present for all code merged from branches or PRs, even if that branch or PR is properly rebased and only a single commit. The merge commit documents that the merge came from a branch/PR. This helps us differentiate those commits from commits that were made straight to master.
``` ```
# on your_branch_name # on your_branch_name