diff options
| author | James Moger <james.moger@gitblit.com> | 2014-05-02 16:05:37 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-05-02 16:05:37 -0400 |
| commit | 9bb31c888eaa3f3949c190c0d0848ec480526ae5 (patch) | |
| tree | 94a5ec7f3f3d151370d9018a4c9c886ef74e505f /src/site/tickets_using.mkd | |
| parent | 685d8311066c673a864fd5645027dd0eecb4550b (diff) | |
| download | gitblit-9bb31c888eaa3f3949c190c0d0848ec480526ae5.tar.gz gitblit-9bb31c888eaa3f3949c190c0d0848ec480526ae5.zip | |
Documentation
Diffstat (limited to 'src/site/tickets_using.mkd')
| -rw-r--r-- | 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 7d9e569a..3936e00d 100644 --- a/src/site/tickets_using.mkd +++ b/src/site/tickets_using.mkd @@ -148,7 +148,7 @@ Add some commits (fast-forward) to ticket *12*. Set the milestone to *1.4.1*. ### 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). |