-
Notifications
You must be signed in to change notification settings - Fork 272
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Some PR's create conflicts even when upstream didn't change #1322
Comments
Actually one with 127 images modded merged w/ no conflict: adamlui/chatgpt-apps#4 One with 9 adamlui/chatgpt-auto-refresh#17 and one with 4 adamlui/chatgpt-auto-continue#5 created the same conflicts though |
adamlui
changed the title
PR's with many image mods create conflicts
Some PR's create conflicts even when upstream didn't change
Jul 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
For example in this one: adamlui/chatgpt-infinity#4
..many conflicts appear:
Then when I try to click Resolve conflicts, it says 'These conflicts are too complex to resolve in the web editor'
Then I have to goto GitHub desktop and manually approve the mods one-by-one:
The text was updated successfully, but these errors were encountered: