[Conflict resolution] -> [#3778] - #3838
Closed
Marius Storhaug (MariusStorhaug) wants to merge 2 commits into
Closed
Marius Storhaug (MariusStorhaug) wants to merge 2 commits into
Marius Storhaug (MariusStorhaug) wants to merge 2 commits into
Conversation
Marius Storhaug (MariusStorhaug)
requested a review
from a team
as a code owner
August 28, 2023 14:20
4 tasks
Alexander Sehr (AlexanderSehr)
requested changes
Aug 28, 2023
Alexander Sehr (AlexanderSehr)
left a comment
Contributor
There was a problem hiding this comment.
Is this PR intended Marius Storhaug (@MariusStorhaug) ? It seems to simply replicate my changes of the net-app PR
Contributor
Author
|
Was intended to resolve conflicts by pulling your commits into this. Not to "take" the commits from you. |
Contributor
|
Wasn't my impression :D I was just wondering as it was a PR to main and not the DEV branch :P |
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
2 participants
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.
Description
Conflict resolution