-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
…c features. fixes #16
- Loading branch information
There are no files selected for viewing
3 comments
on commit 428be39
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This whole thing was now pushed to dev
, but all pull-request target dev2
.
Should I rebase dev2
on dev
?
I'd suggest to send future fixes to dev2
until we merge dev2
to master
, delete dev
, branch a new dev
from master
, bump the version, re-target remaining PRs from dev2
to (new) dev
& finally get rid of dev2
again (see #43 (comment)).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added this commit to dev2
without creating a merge commit.
So now dev2
is again the same as dev
but withot the merge of #43 pulling in the failing Windows tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to force-push another change to dev2
to get a working build for each commit as Travis is still using Ubuntu 12.04 (until July when they'll switch to 14.04) and the CRAN guys seem to have dropped support for that (see travis-ci/travis-ci#7654 (comment)). So we are now testing on 14.04 'already'. 🎉
in case the linter complains, this might be the cause 😉