[Workflow] fix fail merge #12150
Closed
[Workflow] fix fail merge #12150
Conversation
This file contains hidden or 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
|
@noniagriconomie I am sorry, I didn't see your comment in the PR and already pushed a fix for this in 53e5098. |
|
@xabbuh fair enough, but IMO the sentence should remains |
|
I didn't realise that the sentences weren't completely identical but one mentioned "place" and the other one "state". What do you think about changing it to |
|
@xabbuh seems good to me this way :) |
| @@ -83,7 +83,7 @@ you can retreive a workflow from it and use it as follows:: | ||
|
|
||
| // ... | ||
| // Consider that $blogPost is in place "draft" by default | ||
| // Consider that $post is in state "draft" by default | ||
| // Consider that $blogPost is in state "draft" by default |
There was a problem hiding this comment.
The line is duplicated. Maybe it will be fixed after rebasing and fixing the conflicts.
OskarStark
reviewed
Aug 14, 2019
| @@ -83,7 +83,7 @@ you can retreive a workflow from it and use it as follows:: | ||
|
|
||
| // ... | ||
| // Consider that $blogPost is in place "draft" by default |
There was a problem hiding this comment.
Suggested change
| // Consider that $blogPost is in place "draft" by default |
|
It looks that this is already fixed in current |
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.
Please see #12146 (comment)
ping @wouterj cc @alexislefebvre