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).
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.
waiting for this for a long time...
Marcin Kuzminskirepo owner
Issue #743 was marked as a duplicate of this issue.
Is already known when this functionality is coming?
I guess we don't really need conflict handling at the server-side right now, so this would be a simple yet valuable improvement
+1 very needed
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?
Guys, just vote for issue, there's no need in +1'ing all over the place.