Stefan EissingFeb 20

I waded in #curl rebasing pain with a bunch of stacked PRs yesterday. That was unfun and took the whole day.

Maybe I have not found the best way to handle stacked PRs with current git, yet.

Otoh, the colleague who changed variable names all over the code for fun and merged it without review is luckily working remote…😌

Show threadwatteFeb 20
@icing Ive recently learned about "git rebase --update-refs". Dont know if it helps with conflicts, but at least in an utopian scenario without any, makes rebasing stacked branches easier
Show threadStefan Eissing

@watte Yeah, I tried that. Did not work, at least in this case.

With variable renames all over, every commit will have a conflict in places. While in code parts not touched, the rename merge goes through. Which means you have to inspect everything carefully by hand...

I believe "rebase --update-refs" is fine when there is a single commit to be fixed in the stack.

Feb 20 at 8:05amWeb
Show threadwatteFeb 20
@icing huff, cumbersome.. Glad you and the curl code base survived!