- **status**: review --> closed - **Comment**: I think this is good. If we want to improve the conflict detection in the future, your suggestion makes sense.
--- ** [tickets:#7830] One-click merge** **Status:** closed **Milestone:** unreleased **Labels:** sf-current sf-4 42cc **Created:** Mon Feb 09, 2015 04:17 PM UTC by Dave Brondsema **Last Updated:** Wed Mar 18, 2015 04:06 PM UTC **Owner:** Igor Bondarenko Add a button to merge requests to merge the branch on the server-side. Of course, don't do it if there are conflicts. Also need to consider server-side filesystem permissions and make sure install docs are updated if needed, etc. --- Sent from forge-allura.apache.org because [email protected] is subscribed to https://forge-allura.apache.org/p/allura/tickets/ To unsubscribe from further messages, a project admin can change settings at https://forge-allura.apache.org/p/allura/admin/tickets/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.
