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.

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

Feature/r devtools #374

Merged
merged 27 commits into from
Dec 20, 2023
Merged

Feature/r devtools #374

merged 27 commits into from
Dec 20, 2023

Conversation

WouterVanAssche
Copy link
Contributor

No description provided.

@MaximeVdB
Copy link
Contributor

MaximeVdB commented Dec 5, 2023

Hi Wouter -- as you probably noticed, your feature branch does not look in good shape (I suppose you created it by checking out from the outdated development branch). One way to fix it would be like this:

git branch -m feature/R_devtools feature/R_devtools_original
git checkout master
# Assuming you've registered https://github.com/hpcleuven/VscDocumentation.git as "upstream":
git pull --rebase upstream master
git checkout -b feature/R_devtools
git cherry-pick 67b5f88b8af5d203425b65db62161f7a04e67298
git cherry-pick b39cb3b18ace595b749d11f897834a1df6505b9f
git cherry-pick 5a6075cdfe60f5bb566f94cd9d4b93184f702d92
git cherry-pick fbb65ddb08292a1ecae5f3aa6c6eec011247fa97
# (same assumption regarding the name of the remote)
git push --force upstream feature/R_devtools

source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_package_management.rst Show resolved Hide resolved
Copy link
Contributor

@MaximeVdB MaximeVdB left a comment

Choose a reason for hiding this comment

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

Just some last small things:

source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Outdated Show resolved Hide resolved
source/software/r_devtools.rst Show resolved Hide resolved
source/software/r_package_management.rst Outdated Show resolved Hide resolved
source/software/r_package_management.rst Outdated Show resolved Hide resolved
@WouterVanAssche WouterVanAssche merged commit 3cc830e into master Dec 20, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants