|
|
|
|
|
|
by scottlamb
19 days ago
|
|
|
> the original commit being 4-5 lines long (what did claude do then?) I've said "rebase onto <newbase>" and let it handle all the merge conflicts. I wouldn't expect this particular commit to conflict with anything, but it could have been part of a big series where it'd be worth doing that instead of running the rebase command yourself. It wouldn't surprise me if I picked up some Co-Authored-By:s along the way. |
|
|