docs(DEVELOPMENT): added instruction about conflict resolution #9
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
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
slonka
reviewed
Nov 26, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]>
Co-authored-by: Krzysztof Słonka <[email protected]> Signed-off-by: Lukasz Dziedziak <[email protected]>
slonka
approved these changes
Nov 26, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]>
…ahq/go-control-plane into add-conflict-resolution-docs
kumahq bot
pushed a commit
that referenced
this pull request
Dec 3, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 6, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 10, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 11, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 12, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 13, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 18, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 19, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 20, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Dec 24, 2024
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Jan 3, 2025
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
kumahq bot
pushed a commit
that referenced
this pull request
Jan 4, 2025
Signed-off-by: Lukasz Dziedziak <[email protected]> Co-authored-by: Krzysztof Słonka <[email protected]>
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.
Added instruction how to resolve conflicts and modified script to easier get tags used when resolving conflicts