diff --git a/git-version-control.Rmd b/git-version-control.Rmd index 9864d79..f2c6abc 100644 --- a/git-version-control.Rmd +++ b/git-version-control.Rmd @@ -280,6 +280,7 @@ user community can engage in the development of your package. 1. Merge upstream with origin's devel branch, + git checkout -b devel git merge upstream/devel __NOTE:__ If you have the error `fatal: refusing to merge