Repository navigation
Preserve local main changes (03659442b1) - #12
Open
ORESoftware wants to merge 1 commit into
Open
ORESoftware wants to merge 1 commit into
ORESoftware wants to merge 1 commit into
Conversation
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.
The local branch could not be pushed directly to
mainwithout rewriting or conflicting with existing remote history.
This PR preserves the exact local HEAD:
03659442b1d02ed6189b41a8ad9724a00131e06dOriginal local branch:
mainSource machine:
Citadels-MacBook-ProThe automation intentionally did not force push, reset, rebase,
merge, or otherwise rewrite the existing remote branch.