search

poissonconsulting / dttr2

An R package to manipulate dates, times and date times
https://poissonconsulting.github.io/dttr2/
Other
10 stars 2 forks source link

Incorporate tag on fix-cran branch into master #3

Closed joethorley closed 4 years ago

joethorley commented 4 years ago
  1. To check the differences from the merge base:
git checkout fix-cran
git diff master... --numstat
# isolate files of interest
git diff master... CRAN-RELEASE DESCRIPTION NEWS.md R/deprecated.R R/subtract.R README.Rmd README.md build.R cran-comments.md

Auto-merge and check differences:

git checkout -b master-fix-cran master
git merge master -X theirs
\rm CRAN-RELEASE
git add .
git commit
git diff master...

Bring in remaining differences from the merge base manually.

Then:

git checkout master
git merge master-fix-cran

It seems that some of the changes in fix-cran are already incorporated in master. The -X switch in git merge is very useful, but need to double-check results.

github-actions[bot] commented 3 days ago

This old thread has been automatically locked. If you think you have found something related to this, please open a new issue and link to this old issue if necessary.