Fix production conflicts automatically (and more sync tweaks) #390
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
Going to abandon the general solution to focus on the things that commonly happen - rather than trying to reimplement three-way merge, just going to do the right thing with the git conflict file
IncrementalLoad needs to compile with ck, not u - production xdata changes aren't picked up with "u" Protection against argumentless operations in RunGitCommandWithInput
|
Hit one issue: a git rebase --continue may itself trigger a non-conflicting change to the production. We need to ensure it is reloaded and compiled in this case to avoid the really annoying error alert. |
isc-tleavitt
changed the title
isc-tleavitt
changed the title
refactor: add and use utility methods in PullEventHandler
isc-tleavitt
commented
Jul 2, 2024
remove duplicate entry
isc-pbarton
reviewed
Jul 3, 2024
isc-pbarton
approved these changes
Jul 3, 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.
When we sync, we now automatically resolve differences in the production definition.
Also cleans up a few rough edges / edge cases with sync and import.
Fixes #380
Fixes #371
Fixes #389
Fixes #387
Pending tasks: