Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflict handling #345

Closed
felipellrocha opened this issue Feb 14, 2014 · 4 comments
Closed

Conflict handling #345

felipellrocha opened this issue Feb 14, 2014 · 4 comments

Comments

@felipellrocha
Copy link

Hey guys.

Now that pygit has support for merges, are you guys planning on adding support for conflict handling as well?
@felipellrocha
Copy link
Author

Any updates on this?

@jdavid
Copy link
Member

jdavid commented May 8, 2014

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

@carlosmn
Copy link
Member

This functionality got merged as #389.

@felipellrocha
Copy link
Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@carlosmn @felipellrocha @jdavid