Big Green "Merge" Button

Issue #708 resolved
Na'Tosha Bard created an issue

Add a big green "auto-merge" button so that pull requests that are approved can be merged automatically server-side (assuming there are no conflicts).

Comments (20)

  1. Janis Sirs

    Definately needs this, this is a major pain for me and I'm sure that this is keeping off a lot of other as well.

  2. David Vega

    I guess we don't really need conflict handling at the server-side right now, so this would be a simple yet valuable improvement

  3. David Vega

    So what would be the policy when a conflict is detected? (see hg help merge-tools)

    I'd go for internal:prompt (thus adding the option of taking local or other to the UI), or alternatively discourage merging online when there is the slightest conflict by using internal:fail then hg revert -all.

    Also, if I'm not mistaken, doing a merge implies populating the working directory, which is not the default behavior in Rhodecode. Would this imply cleaning up the working directory after a merge+commit take place?

  4. Log in to comment