|
|
|
|
|
|
by lostdog
418 days ago
|
|
|
IMO the best is to merge main into your branch. Then squash the result into a single change and rebase onto main. This way you can merge in a "normal" way, removing the conflicts with main, but then your own change goes in cleanly on top of main. It takes some git gymnastics to transplant the merge back onto main cleanly. |
|
|