search

crablang / crab

A community fork of a language named after a plant fungus. All of the memory-safe features you love, now with 100% less bureaucracy!
https://www.crablang.org
Other
5.13k stars 66 forks source link

update sync script #70

Closed trvswgnr closed 1 year ago

trvswgnr commented 1 year ago

uses git rebase -Xtheirs instead of checking out files on top of git reset --hard

this way we don't need to keep track of individual changed files, and relevant upstream changes can be merged into the same files.

this will come with its own set of challenges, but should ultimately be a better approach, as @lleyton's suggested.

trvswgnr commented 1 year ago

LGTM ✅

made a minor change to reset 'current' branch to crab remote origin/master instead of local remote, which might be out of date.