docs: explain the strategy equivalent to the cherry-pick defaults #110
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
lampajr
reviewed
Mar 30, 2024
There was a problem hiding this comment.
Hi @earl-warren , thanks a lot for this documentation improvement!
Everything that can help other users is really welcome 🙏
I left just one comment, apart from that it looks good to me!
|
Furthermore, if the default merge strategy has been changed from git perspective.. we might consider changing it here as well in future releases (keeping in mind that this is going to introduce a breaking change) |
lampajr
approved these changes
Mar 30, 2024
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.
Refs: https://codeberg.org/forgejo/forgejo/issues/2886