Git Product home page Git Product logo

Comments (3)

andresriancho avatar andresriancho commented on August 18, 2024

Asked a question at the GitPython mailing list about merge conflicts. Check tomorrow for an answer
https://groups.google.com/forum/?fromgroups#!forum/git-python

from w3af.

andresriancho avatar andresriancho commented on August 18, 2024

All working but the following:

  • update() is slow and makes the GUI unresponsive

  • changelog doesn't show on the summary window

  • need to be able to pull() to a specific revision: only available with the console WONTFIX.

  • need unittesting for fetch and pull, create a new (local) repo for testing? WONTFIX: was useful only if I wanted to support moving to a specific commit, but I won't re-test that PythonGit's fetch() and pull() work as expected since I'm calling them without any strange parameters and they already have unittests for their core.

  • need to detect merge conflicts (see answer on mailing list) and reset() to a previous revision

    Pending work for the next milestone: #98

from w3af.

andresriancho avatar andresriancho commented on August 18, 2024

Tested reset()
Tested repo_has_conflicts() using [0]

[0] https://raw.github.com/phluks/create-git-conflict.sh/master/create-git-conflict.sh

from w3af.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.