Sync opencraft-release/quince.1 with Upstream 20240318-1710721354 #11
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.
Syncing opencraft-release/quince.1 with Upstream
Important❗
Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.
Note on Conflicts⚠️
In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:
sync-open-release/quince.master-20240318-1710721354
locally:opencraft-release/quince.1
into that branch, make sure your[REMOTE]
is pointing toopencraft-release/quince.1
:sync-open-release/quince.master-20240318-1710721354
to update this PRNote: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.