Code Monkey home page Code Monkey logo

git-automerger-plugin's Issues

Create merge rules to keep old or new whole file

The rules KEEP_OLDER and KEEP_NEWER only keep proper lines on conflict. However, sometimes there could be a line without conflicts and the user prefers to keep the whole file of a specific version rather than try to merge it.

Optional parameters is not so optional 

org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
WorkflowScript: 129: Missing required parameter: "remoteName" @ line 129, column 17.
                   gitAutomerger releaseBranchPattern: 'release/%',
                   ^

WorkflowScript: 129: Missing required parameter: "checkoutFromRemote" @ line 129, column 17.
                   gitAutomerger releaseBranchPattern: 'release/%',

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.