Giter VIP home page Giter VIP logo

gitkraken-bug's Introduction

How to reproduce

  1. Open in GitKraken
  2. Checkout branch-1 and branch-2 localy
  3. Checkout branch-1
  4. Right-click on branch-2 and click Merge branch-2 into branch-1
  5. Click on the conflicted file file.js. Notice the conflict resolution proposed by GitKraken
  6. Abort the merge
  7. Open the terminal from Mac OS (not the one from GitKraken) and navigate to the repo folder
  8. Execute command git merge branch-2
  9. Go back to GitKraken, and click on the conflicted file file.js.
  10. Observe the different conflict resolution

Expected behaviour

Making a merge with GitKraken should have the same outcome as making a merge using the git command line

gitkraken-bug's People

Contributors

surdu avatar

Watchers

avatar

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.