Bdickson latest edits - fix issue with generated test data #7
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
bleggett
reviewed
Apr 8, 2020
|
@brian-peter-dickson Can you resolve the merge conflict? |
bleggett
approved these changes
Apr 8, 2020
|
@brian-peter-dickson This one still has conflicts with master caused by your later commits - is this PR obsolete or does it still need to have the conflicts resolved and get merged? |
|
I think those conflicts can be ignored, no need to merge them.
I'm not familiar enough with git workflows to know for sure how to do that.
Do you have the necessary permissions to accomplish this?
Thanks,
Brian
…On Fri, Apr 17, 2020 at 11:14 AM Ben Leggett ***@***.***> wrote:
@brian-peter-dickson <https://github.com/brian-peter-dickson> This one
still has conflicts with master caused by your later commits - is this PR
obsolete or does it still need to have the conflicts resolved and get
merged?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#7 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABPFI3OCBHRK6FLQSELULP3RNCMCBANCNFSM4MDTRPBA>
.
|
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.
No description provided.