From 9e6cdf65d45e29c3cdd5589d93d7bc1c59666786 Mon Sep 17 00:00:00 2001 From: Mario Fasold Date: Tue, 17 Oct 2023 10:07:33 +0200 Subject: [PATCH] Fix non-existing branch error in section "Subversion to Git Transition" --- git-version-control.Rmd | 1 + 1 file changed, 1 insertion(+) 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