Hopefully this actually fixes docs-update push conflicts

UBCSailbot / sailbot_workspace

UBC Sailbot's monorepo

Apache License 2.0

4 stars 1 forks source link

Closed patrick-5546 closed 3 months ago

patrick-5546 commented 3 months ago

Continuation of #356
Specify to merge if branches diverge (before nothing was specified and it wasn't sure what to do)