Skip to main content

Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

    •  
      request #13259 Disable auto-merging of lockfiles
    Actions
    Infos
    #13259
    Thomas Gerbet (tgerbet)
    2019-04-15 11:30
    2019-04-12 13:57
    14131
    Details
    Disable auto-merging of lockfiles
    When rebasing or merging a contribution where a lockfile is modified, Git will attempt to merge the file. Even if it succeeds, the resulting lockfile will not be coherent. We should disable the auto-merging of the lockfiles so that the contributor explicitly know the merge needs to be dealt with manually.
    Dev tools
    Empty
    Empty
    • [ ] enhancement
    • [ ] internal improvement
    Empty
    Stage
    Empty
    Closed
    2019-04-12
    Attachments
    Artifact links

    Releases

    Fixed in

    Artifact ID Project Tracker Summary Status Last Update Date Submitted By Assigned to
    rel #12934 Tuleap Releases 11.1 Delivered 2019-05-02 12:05 Manuel Vacelet (vaceletm)
    Empty
    References
    Referencing request #13259

    Git commit

    tuleap/tuleap/stable

    Merge commit 'refs/changes/96/14696/1' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD fd28f3d25f
    User avatar Joris MASSON (jmasson) , 2019-04-12 14:57
    request #13259: Disable auto-merging of lockfiles 9454d133f7
    User avatar Thomas Gerbet (tgerbet) , 2019-04-12 13:57
    Referenced by request #13259

    Artifact Tracker v5

    rel #12934 11.1

    Other

    gerrit #14696
    Display settings

    Follow-ups