From ec24568f14ee38b264c86133ce8ebcc35a39034b Mon Sep 17 00:00:00 2001 From: David Ostrovsky <david@ostrovsky.org> Date: Mon, 05 May 2014 11:16:30 -0400 Subject: [PATCH] Add http request filter extension point --- src/site/tickets_using.mkd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/site/tickets_using.mkd b/src/site/tickets_using.mkd index 7d9e569..3936e00 100644 --- a/src/site/tickets_using.mkd +++ b/src/site/tickets_using.mkd @@ -148,7 +148,7 @@ ### Merging Patchsets -The Gitblit web ui offers a merge button which *should work* but is not fully tested. Gitblit does verify that you can cleanly merge a patchset to the integration branch. +The Gitblit web ui offers a merge button which will work for clean merges of a patchset to the integration branch. There are complicated merge scenarios for which it may be best to merge using your Git client. There are several ways to do this, here is a safe merge strategy which pulls into a new branch and then fast-forwards your integration branch, assuming you were happy with the pull (merge). -- Gitblit v1.9.1