Skip to content
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

Resolving UserMergeOptions Object #522

Merged
merged 2 commits into from
Oct 20, 2017
Merged

Resolving UserMergeOptions Object #522

merged 2 commits into from
Oct 20, 2017

Conversation

nkumarom
Copy link

@nkumarom nkumarom commented Aug 4, 2017

If you pass the merge parameter as following:
Merge Before Build:
Name of repository : refs/remotes/origin
Branch to merge to : ${BRANCH_NAME}
Merge Strategy: default
Fast-forward mode: --ff

Here BRANCH_NAME is a String Parameter.
Then the output printed in console is something like:
Merging Revision 54f103b61f0b3504503f4990204f8dec8ea612ea (refs/remotes/origin/sample) to refs/remotes/origin/master, UserMergeOptions{mergeRemote='refs/remotes/origin', mergeTarget='${BRANCH_NAME}', mergeStrategy='default', fastForwardMode='--ff'}

With this Pull Request , the output is correct as the object is resolved correctly:
Merging Revision 54f103b61f0b3504503f4990204f8dec8ea612ea (refs/remotes/origin/sample) to refs/remotes/origin/master, UserMergeOptions{mergeRemote='refs/remotes/origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}

@MarkEWaite MarkEWaite merged commit c5fbe73 into jenkinsci:master Oct 20, 2017
@MarkEWaite MarkEWaite added the skip-changelog Exclude from the changelog label Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog Exclude from the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants