#230 - Fix CI merge formatting test. #231
Merged
Conversation
This file contains 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
jbarrick-mesosphere
force-pushed
the
ci-merge
branch
from
3a4f617
to
3ee007e
Compare
|
Oh, duh, git is mad that it hasn't been configured with a username and email. |
alenkacz
reviewed
May 10, 2019
.circleci/config.yml
Outdated
| - run: | | ||
| git config user.name "Circle CI" | ||
| git config user.email "ci@mesosphere.com" | ||
| git checkout -b pr |
There was a problem hiding this comment.
The first two lines are great 👍 I am just wondering why you did not stick with git merge origin/master ?
There was a problem hiding this comment.
I was still working on this since I couldn't test it without making a pull request, but basically I misunderstood the error and thought the issue was that we were merging master into the PR instead of the PR into master. That may be an issue (I'm not sure), but the actual issue that I was hitting was the Git configuration.
It should be ready for review now!
Fixes kudobuilder#230. We set the user name and email and a commit message in case a merge commit needs to be created.
jbarrick-mesosphere
force-pushed
the
ci-merge
branch
from
e48d603
to
37c0379
Compare
gerred
approved these changes
May 13, 2019
joerg84
approved these changes
May 13, 2019
alenkacz
approved these changes
May 23, 2019
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
We set the user name and email and a commit message in case a merge commit needs to be created.
Which issue(s) this PR fixes:
Fixes #230