Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
TODO: implement different ticket merging ... #198
That section of the docs is gone in the current branch. I've switched (more-or-less) to git-flow so develop is the integration branch for the next release. master is the last stable release +hotfixes. Features are developed on ticket/N branches using dev.gitblit.com. So.... why don't you open a ticket on dev.gitblit.com for merge strategies. I've been testing/stabilizing the 1.6.0 release for the past week or so. Due for release today or tomorrow.