Rcheckin should respect --no-merge option #928
Merged
Conversation
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
|
Hm the issue with teamcity build doesn't seem to be related to my changes in any way. Are there some changes going on with teamcity build and its results could be ignored, or it is some real isssue I don't quite understand? |
Yeah, that's trying to compile the MSI, but it's not working. #922 added GitTfs_Setup to the CI build, and it worked that time. I'm not sure why it broke in the meantime. This branch looks good to me. |
spraints
added a commit
that referenced
this pull request
Mar 17, 2016
…merge Rcheckin should respect --no-merge option
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I found that
--no-mergewas used just to format output string, but made no difference with TFS doing. And as I actually needed the option I had to fix it.I'm not sure though it is the only place that requires changes, but I haven't found others.