Features/362#363
Closed
mivola wants to merge 3 commits into
Closed
Conversation
merge from jenkinsci
…:8080" parameter on the command line
khmarbaise
reviewed
Sep 25, 2018
khmarbaise
left a comment
khmarbaise
left a comment
Member
There was a problem hiding this comment.
If you have to do a merge into the branch it looks your are doing something wrong in Git. Usually you do a git rebase master in your branch instead of git merge...otherwise this will become confusing while later going back into master...
Contributor
Author
|
@khmarbaise I did the merge in my forked master branch, not in the feature branch... Afterwards I created the new "features/362" branch. Should I now revert that merge in my forked master branch and try to rebase? And then create a new branch for #362? |
Contributor
Author
|
this PR is replaced by #381 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.