|
||||||||
|
This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira |
||||||||
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Thanks Bue.
There's something I don't understand, maybe related to the branching model.
We develop our stories on separate feature branches, then we create pull requests to merge to our 'development' branch (The process to merge with the 'master' branch is not part of our development process, actually this merge comes later in our delivery process).
When I installed the plugin, I did some tests on brand new branches: 'dev' and 'int'. It worked! The plugin did not attempt to make a new commit, it only applied existing 'dev' commits on 'int'.
Since my tests were successful, I decided to delete my temporary branches and configure the plugin to build our existing 'development' branch and to merge within new 'integration' branch.
Since that time we have the interesting situation described in this ticket.
Why does the plugin try to perform an additional commit now it is configured on our real 'development' branch?
Should the 'integration' branch be created in advance in the repository? If so, what must be the parent of the 'integration' branch?
master: do not touch![]()
development: where we merge developers' pull requests are merged
story/**: features branches
maintenance/**: guess
integration: you tell me
I want your plugin to build 'development' and, if successful, to merge on 'integration'.
Without affecting the master, what is the branching model in which the current version of the plugin work?