Skip to content

Conflict handling #345

Closed
Closed
Conflict handling#345

Description

@felipellrocha
felipellrocha
opened on Feb 14, 2014

Hey guys.

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

Activity

  1. felipellrocha commented on May 7, 2014

    @felipellrocha
    felipellrocha
    on May 7, 2014
    Author

    Any updates on this?

  2. jdavid commented on May 8, 2014

    @jdavid
    jdavid
    on May 8, 2014
    Member

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

  3. carlosmn commented on Jul 10, 2014

    @carlosmn
    carlosmn
    on Jul 10, 2014
    Member

    This functionality got merged as #389.

  4. carlosmn
    closed this as completedon Jul 10, 2014

  5. felipellrocha commented on Jul 18, 2014

    @felipellrocha
    felipellrocha
    on Jul 18, 2014
    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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions