yearmon() now always ends with two integers#7723
Open
LunaticSage218 wants to merge 1 commit intoRdatatable:masterfrom
Open
yearmon() now always ends with two integers#7723LunaticSage218 wants to merge 1 commit intoRdatatable:masterfrom
LunaticSage218 wants to merge 1 commit intoRdatatable:masterfrom
Conversation
Author
|
Sorry I made a second pull request, this is still for issue #7694 |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7723 +/- ##
=======================================
Coverage 99.04% 99.04%
=======================================
Files 87 87
Lines 17123 17058 -65
=======================================
- Hits 16959 16895 -64
+ Misses 164 163 -1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Member
|
Do you need help moving your changes from the yearmon-fix branch (this PR#7723) to the master branch (previous PR#7713)?
|
Author
|
That would be a huge help, thank you. |
Member
|
What you did in PR#7723 is sort of like a rebase: you applied your changes on top of a later state of the target branch (https://git-scm.com/book/en/v2/Git-Branching-Rebasing). In a different project, something like the Linux kernel, where clean commit history matters and every resubmission is done from effectively a different branch, the developer is encouraged to rebase on top of latest master. Since rebasing makes it harder for multiple people to work on the same branch and we squash every merge commit anyway, we don't usually rebase here.
Conflicts happen all the time in real-life development, so it's useful to be able to solve them: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts
Here, we can first merge the data.table master branch into the PR#7713 branch, then apply the files from the PR#7723 commit on top of the result:
git remote add upstream https://github.com/rdatatable/data.table
git fetch upstream
git checkout master
git merge upstream/master
# make sure to keep both sides of the two conflicts
git commit
git checkout 6d0dd35 -- NEWS.md R/IDateTime.R inst/tests/tests.Rraw man/IDateTime.Rd
git commit
|
Author
|
Ok, your fix helped a lot, can I close this pull request since it isn't needed? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thank you for contributing to data.table!
Please be sure to read our CONTRIBUTING guide. In particular, "Contributors are requested not to use code assistants if they are not able to evaluate license of the code provided by an assistant, and to provide proper citation."