-
Notifications
You must be signed in to change notification settings - Fork 0
Trying vcr #11
base: master
Are you sure you want to change the base?
Trying vcr #11
Conversation
@trevordocherty the failures here are code style failures. To see those locally, you can run
Here are the failures showing in the CI build log (which you can see by clicking on one of the Details links for the CI builds below or by clicking on the red X next to the commit ID above):
3 of 4 should be self-explanatory. The last one is asking you to use the |
@trevordocherty You've got a merge conflict now. This is likely because I pulled upstream's |
@trevordocherty that commit modified the You can look at the merge conflict in Github via the "Resolve conflicts" button. May be worthwhile to do that so you can see exactly what the conflict is. Also, conflicts are identified like changes in a |
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.
Can you un-delete the Gemfile.lock? Looks good besides that I think
@mdworken added the file back |
@mdworken when you get a chance, can you please review this one? |
@trevordocherty you'll need to re-merge master into this branch, as it's out of date. |
1352fb4
to
23966a5
Compare
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.
Looks like the Gemfile.lock is showing as all deleted then re-added in git. If you'd like I can help you fix this.
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 fixed it
@mdworken can you look at this again? |
Resolves #1
Description
Type of change
How Has This Been Tested?
Screenshots