Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix non-existing branch error in section "Subversion to Git Transition" #114

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Fix non-existing branch error in section "Subversion to Git Transition" #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions git-version-control.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of this, add a note below it saying something like if the default branch is not devel use:

git branch -M devel

git merge upstream/devel

__NOTE:__ If you have the error `fatal: refusing to merge
Expand Down