Oxen-AI / Oxen

Oxen.ai's core rust library, server, and CLI
https://oxen.ai
Apache License 2.0
176 stars 11 forks source link

Add the BASE and HEAD commit ids to the merge response #282

Closed lewazo closed 5 months ago

lewazo commented 5 months ago

This adds the head_commit and base_commit IDs to the merge response.

It also returns an error if the merge can't happen ie. There was an error merging or the branches has merge conflicts.