search

weltling / parle

Parser and lexer for PHP
Other
82 stars 9 forks source link

Synch #53

Closed BenHanson closed 1 year ago

BenHanson commented 1 year ago

For some reason github thinks my branch is not in synch still

weltling commented 1 year ago

Yeah, there's an empty set in the out. Perhaps you could just reset your main to this one and force push? Merging this doesn't seem right as it's all in here already.

Thanks

weltling commented 1 year ago

Like this maybe:

git checkout main
git remote add weltling https://github.com/weltling/parle
git fetch weltling
git reset --hard weltling/main
git push --force origin main

ofc if you've some patches upon the state, should backup them. In the future also, perhaps a dedicated feature branch per change would be a better flow. Then one can update main to upstream and throw away the feature branch. I guess you also should be able to create feature branches is this repo, might be worth trying.

Thanks

weltling commented 1 year ago

Hmm, another strategy i could think of maybe you can rebase to this one instead of reset. Kinda same flow, and just one command would differ - git pull --rebase weltling main ... This will allow to keep any additional commits automatically. But it's up to you depending on the situation.

Thanks