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

Merged

isc-tleavitt merged 19 commits into

mainfrom

fix-production-conflicts

Jul 3, 2024

Commits on Jun 26, 2024

wip: smarter behavior on rebase conflicts on production
isc-tleavitt
committed

Commits on Jul 1, 2024

Merge remote-tracking branch 'origin/only-commit-msg-when-changes' into fix-production-conflicts
isc-tleavitt
committed
feat: alert with warning if sync fails without commit
isc-tleavitt
committed
fix: diff handles renames on checkout
isc-tleavitt
committed

Commits on Jul 3, 2024

fix: only call %Extends if class defined
isc-tleavitt
committed