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:57:14 -04:00
parent c785a9bd58
commit 9ce40efbc7
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

@ -39,7 +39,7 @@ We want a merge commit present for all code merged from PRs, even if that PR is
# on your_branch_name
git fetch
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 there are conflicts, ask the PR creator to fix them. run `git rebase --abort` to abort
# if no conflicts, proceed ...
git checkout master
git pull