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 18:55:11 -04:00
parent 2c434cb4ba
commit c785a9bd58
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

@ -39,6 +39,8 @@ We want a merge commit present for all code merged from PRs, even if that PR is
# on your_branch_name # on your_branch_name
git fetch git fetch
git rebase origin/master git rebase origin/master
# if there are conflicts at this point, ask the PR creator to fix them. run `git rebase --abort` to abort
# if no conflicts, proceed ...
git checkout master git checkout master
git pull git pull
git merge --no-ff your_branch_name git merge --no-ff your_branch_name