2 ms·
> Merge main into your branch The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.
by Izkata 2y ago
> Merge main into your branch
The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.