Closed bdpedigo closed 1 year ago
not sure why we're getting merge conflicts here @daxpryce @j1c any ideas?
not sure why we're getting merge conflicts here @daxpryce @j1c any ideas?
I did a git rebase main
and force pushed, think that fixed things.
NOTE this merge should be done via "Rebase and merge" option!