Closed
Conversation
Member
|
/compile amend / |
91c8d0c to
daec072
Compare
daec072 to
169de87
Compare
rakekniven
approved these changes
Apr 22, 2022
CarlSchwan
approved these changes
Apr 22, 2022
Contributor
Author
|
/rebase |
Contributor
Author
|
I am asking for a solution to the conflict. I cannot do it from GitHub 😬. |
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
169de87 to
717430b
Compare
Contributor
Author
|
I am asking a merge. |
Contributor
|
/rebase |
Member
|
Node failed. @szaimen What does "Check webpack build changes" mean? |
Contributor
|
/rebase |
Merged
Contributor
Author
|
/rebase |
Contributor
Author
|
How do I remove a conflict? |
Member
|
/compile amend / |
9466c20 to
2c3042c
Compare
Contributor
Author
|
/compile amend / |
2c3042c to
b2abe63
Compare
Merged
Contributor
Author
|
/compile amend / |
Contributor
Author
|
Please help me resolve the conflict. PR has been hanging for a long time, so changes cannot be made to the new version of NC. |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
b2abe63 to
527dfc8
Compare
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
Merged
Merged
Contributor
|
follow-up in #37770 |
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
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.
Signed-off-by: Valdnet 47037905+Valdnet@users.noreply.github.com