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

fix: Fix breaking datepicker test with merge #1240

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Conversation

skvale
Copy link
Contributor

@skvale skvale commented Oct 12, 2020

Description

Fix the failing build on the master branch after I merged the last PR

fixes #issueid

@skvale skvale self-assigned this Oct 12, 2020
@skvale skvale changed the title test(datepicker): Fix breaking test with merge fix(datepicker): Fix breaking test with merge Oct 12, 2020
@skvale skvale changed the title fix(datepicker): Fix breaking test with merge fix: Fix breaking datepicker test with merge Oct 12, 2020
Copy link
Contributor

@jbadan jbadan left a comment

Choose a reason for hiding this comment

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

Should we add a branch setting that requires your branch to be up to date with master before merge?

🚢

@netlify
Copy link

netlify bot commented Oct 12, 2020

@skvale
Copy link
Contributor Author

skvale commented Oct 12, 2020

Should we add a branch setting that requires your branch to be up to date with master before merge?

Has it been a problem before? My thought process was: "I should probably merge the latest in, but I don't want to wait another 4 hours for my build to finish" so, to me, the root-cause was painfully slow Travis builds

@jbadan
Copy link
Contributor

jbadan commented Oct 12, 2020

@skvale Not sure what to tell you 🤷 We're trying to switch over to travis.com (waiting on red tape of course), but it's also going to be painfully slow as soon as those other repos that hog the builds move over there.

@skvale skvale merged commit 5cdaaae into master Oct 12, 2020
@skvale skvale deleted the test/fix-failing-test branch October 12, 2020 16:52
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.

3 participants