New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TODO: implement different ticket merging ... #198

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@davido
Contributor

davido commented Jun 16, 2014

strategies on submit action

@gitblit

This comment has been minimized.

Show comment
Hide comment
@gitblit

gitblit Jun 16, 2014

Owner

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.

Owner

gitblit commented Jun 16, 2014

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.

@gitblit gitblit closed this Jun 16, 2014

gitblit added a commit that referenced this pull request Sep 30, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment