change: adapt to new Result interface

exercism / ocaml

Exercism exercises in OCaml.

https://exercism.org/tracks/ocaml

MIT License

94 stars 50 forks source link

change: adapt to new Result interface #324

Closed marionebl closed 5 years ago

marionebl commented 5 years ago

Depends on #315

sshine commented 5 years ago

I'm not sure how to best resolve these conflicts.

They appear because the lines you comment out are in close proximity.

sshine commented 5 years ago

I tried to use the web editor to resolve the conflict.

Seems to work out fine as long as there's only one commit, since then I can squash merge.

When there are two commits, I'll let you do a fixup so I can rebase.

sshine commented 5 years ago

Seems like merging a lot of PRs that all conflict with one another is just tedious.

sshine commented 5 years ago

The many branch merges were caused by me misunderstanding the GitHub UI: The "Rebase and merge" button was greyed out because, naturally, I can't rebase something that's merged heavily (diverging heads). I thought that I was needing to create yet another merge commit. But I needed to switch into "Squash merge", which was my original intent, anyway.

Things go easier from here. :-)