Unable to sync fork, requiring PR for some reason #696
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
|
Try this . Copy your files to another location as these are all in chat agent Then download a zip of th current repo, copy the files from chat agent into your repo, commit. This forces it to match what I have so you can rebase. After rebase, Then move your copy of the chat agent files back over top of what is there and commit. Do this process only I'm the files above complaining about the merge conflict as it's extensive bc of formatting changes mixed in with your actual changes |
|
Thanks! That seems to have worked for syncing. |
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.
Unable to sync my fork due to merge conflicts, here's a PR since that's all GitHub would let me do :/. There is some important functional stuff here, so I hope the merge issues are easy to fix