Merge says no changes but compare says there are many differences
(TFS 2012)
We created a new branch from our "Dev" and called it "Sub", checked out all files for edit and dropped in some new files and amendments. We know that there should be some conflicts between these and the "Dev" branch.
When we do a compare on the two branches it shows the changes and additions. However when we do a merge from Source - "Dev" to Target - "Sub" it says no changes. We dont want these changes in the Dev only to resolve conflicts between Dev/Sub and have them in Sub
Is this because the direction of the merge and the changes have been made in Sub. I thought the merge was the same as compare or have I missed something?
tfs tfs2012
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
add a comment |
(TFS 2012)
We created a new branch from our "Dev" and called it "Sub", checked out all files for edit and dropped in some new files and amendments. We know that there should be some conflicts between these and the "Dev" branch.
When we do a compare on the two branches it shows the changes and additions. However when we do a merge from Source - "Dev" to Target - "Sub" it says no changes. We dont want these changes in the Dev only to resolve conflicts between Dev/Sub and have them in Sub
Is this because the direction of the merge and the changes have been made in Sub. I thought the merge was the same as compare or have I missed something?
tfs tfs2012
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
add a comment |
(TFS 2012)
We created a new branch from our "Dev" and called it "Sub", checked out all files for edit and dropped in some new files and amendments. We know that there should be some conflicts between these and the "Dev" branch.
When we do a compare on the two branches it shows the changes and additions. However when we do a merge from Source - "Dev" to Target - "Sub" it says no changes. We dont want these changes in the Dev only to resolve conflicts between Dev/Sub and have them in Sub
Is this because the direction of the merge and the changes have been made in Sub. I thought the merge was the same as compare or have I missed something?
tfs tfs2012
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
(TFS 2012)
We created a new branch from our "Dev" and called it "Sub", checked out all files for edit and dropped in some new files and amendments. We know that there should be some conflicts between these and the "Dev" branch.
When we do a compare on the two branches it shows the changes and additions. However when we do a merge from Source - "Dev" to Target - "Sub" it says no changes. We dont want these changes in the Dev only to resolve conflicts between Dev/Sub and have them in Sub
Is this because the direction of the merge and the changes have been made in Sub. I thought the merge was the same as compare or have I missed something?
tfs tfs2012
tfs tfs2012
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
asked Nov 21 '18 at 14:58
CerIsCerIs
15128
15128
add a comment |
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53414799%2fmerge-says-no-changes-but-compare-says-there-are-many-differences%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53414799%2fmerge-says-no-changes-but-compare-says-there-are-many-differences%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
