libgit2/pygit2

Conflict handling

felipellrocha opened this issue · 4 comments

felipellrocha commented

Hey guys.

Now that pygit has support for merges, are you guys planning on adding support for conflict handling as well?

felipellrocha commented

Any updates on this?

jdavid commented

Hello @felipellrocha , I don't have plans, but will review a PR if someone wishes to contribute.

carlosmn commented

This functionality got merged as #389.

felipellrocha commented

Yes!!! Thank you so much! I had been waiting on this! :)