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-10-24 09:56:06 -04:00
parent 9cb3e12a14
commit 3234e19254
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Branching-and-Merging.md

@ -48,6 +48,7 @@ git merge --no-ff your_branch_name
git push
git push --delete origin your_branch_name
```
**Note:** There's no way to do this exact flow when merging PRs on Github. If you use the "create merge commit" option, it will not rebase. If you use "rebase and merge", it will not create a merge commit. In light of this, if you're gonna merge on Github, its ok not to rebase beforehand. Please still try to rebase when you can, for example before you create the PR. It this makes the history a lot easier to read.
## Example