Skip to content

Fix production conflicts automatically (and more sync tweaks) #390

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 19 commits into from
Jul 3, 2024
Merged

Fix production conflicts automatically (and more sync tweaks) #390

merged 19 commits into from
Jul 3, 2024

Conversation

isc-tleavitt
Copy link
Collaborator

@isc-tleavitt isc-tleavitt commented Jun 28, 2024 •
edited
Loading

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:

  • preserve commit messages in production merge
  • support resolution on sequential commits - skipping for now, won't happen with a single file
  • ensure a git rebase --continue that modifies the production reloads and compiles it
  • fix handling of rename on diff for sync

@isc-tleavitt
wip: smarter behavior on rebase conflicts on production
ba13a10
@isc-tleavitt
wip: more work toward smart XML three-way merge
724d118 
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
@isc-tleavitt
feat: automatically resolve common production conflict case
327369a
@isc-tleavitt
Update CHANGELOG.md
5cbf1b6
@isc-tleavitt
Merge branch 'main' into fix-production-conflicts
593c858
@isc-tleavitt
fix: various things for demo
be5a51d 
IncrementalLoad needs to compile with ck, not u - production xdata changes aren't picked up with "u"
Protection against argumentless operations in RunGitCommandWithInput
@isc-tleavitt isc-tleavitt marked this pull request as draft June 28, 2024 13:45
@isc-tleavitt isc-tleavitt mentioned this pull request Jul 1, 2024
Closed
@isc-tleavitt
Copy link
Collaborator Author

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 isc-tleavitt changed the title Fix production conflicts automatically Fix production conflicts automatically Jul 2, 2024
@isc-tleavitt isc-tleavitt changed the title Fix production conflicts automatically Fix production conflicts automatically (and more sync tweaks) Jul 2, 2024
@isc-tleavitt
fix: menu discard calls PullEventHandler
c82de15 
refactor: add and use utility methods in PullEventHandler
@isc-tleavitt
fix: sync rebase properly with diff
c6752f8
@isc-tleavitt isc-tleavitt marked this pull request as ready for review July 2, 2024 17:09
@isc-tleavitt isc-tleavitt requested a review from isc-pbarton July 3, 2024 16:52
@isc-tleavitt isc-tleavitt merged commit 5b1428b into main Jul 3, 2024
2 checks passed
@isc-tleavitt isc-tleavitt deleted the fix-production-conflicts branch July 3, 2024 17:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@isc-pbarton isc-pbarton isc-pbarton approved these changes

@isc-hwojnick isc-hwojnick Awaiting requested review from isc-hwojnick

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@isc-tleavitt @isc-pbarton @isc-hwojnick