grammars-v4 icon indicating copy to clipboard operation
grammars-v4 copied to clipboard

Published 20 hours ago • verified publisher icon antlr

PR rebasing

Open teverett opened this issue 2 years ago • 5 comments

@KvanTTT @kaby76

It would be helpful if we could rebase PR's from GH. We can force dependabot to rebase its PR's but not other PR's.

Could this help?

https://github.com/cirrus-actions/rebase

teverett avatar Feb 16 '22 22:02 teverett

@teverett I'm really not an expert at GitHub, Git, and rebasing. I always seem to end up in a bad state, likely because I made a commit public. If I have to rebase, I close the PR, and reopen/redo it from scratch with the latest checked in code.

kaby76 avatar Feb 16 '22 23:02 kaby76

@kaby76 me either. However I see a numbe of PR's that I'd like to get onto the tree and I think they'd pass the automated tests if we could rebase them. I'm trying to figure out how to make that happen.

teverett avatar Feb 17 '22 00:02 teverett

Yes, it's possible to select rebase/squash merging right in GitHub. There is nothing complicated about it. I'm using rebasing/squashing in recent times for grammars because merge commit does not provide any useful info.

KvanTTT avatar Feb 20 '22 20:02 KvanTTT

i think what I'm looking for is a way to rebase without merge. I'd like to run the tests on the rebased PR and then merge.

teverett avatar Feb 21 '22 15:02 teverett