In TortoiseSVN, can Merge-conflicts occur also after resolving the Update-conflicts?
0
I work on a branch from a trunk. Before merging it back to the trunk, I update the branch. After resolving the update-conflicts, the branch is merged with the trunk.
Do you know if conflicts occur during merge, even after resolving the update-conflicts?
tortoisesvn merge-conflict-resolution
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
add a comment |
0
I work on a branch from a trunk. Before merging it back to the trunk, I update the branch. After resolving the update-conflicts, the branch is merged with the trunk.
Do you know if conflicts occur during merge, even after resolving the update-conflicts?
tortoisesvn merge-conflict-resolution
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24
add a comment |
0
0
0
I work on a branch from a trunk. Before merging it back to the trunk, I update the branch. After resolving the update-conflicts, the branch is merged with the trunk.
Do you know if conflicts occur during merge, even after resolving the update-conflicts?
tortoisesvn merge-conflict-resolution
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
I work on a branch from a trunk. Before merging it back to the trunk, I update the branch. After resolving the update-conflicts, the branch is merged with the trunk.
Do you know if conflicts occur during merge, even after resolving the update-conflicts?
tortoisesvn merge-conflict-resolution
tortoisesvn merge-conflict-resolution
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
asked Dec 31 '18 at 8:29
shrin_monkshrin_monk
11
11
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24
add a comment |
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24
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
});
}
});
draft saved
draft discarded
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%2f53985240%2fin-tortoisesvn-can-merge-conflicts-occur-also-after-resolving-the-update-confli%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
draft saved
draft discarded
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.
draft saved
draft discarded
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%2f53985240%2fin-tortoisesvn-can-merge-conflicts-occur-also-after-resolving-the-update-confli%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
Sure. Nothing prevents you from editing the same lines of code in different branches.
– Álvaro González
Dec 31 '18 at 10:47
I'm not understanding the question. So you made a branch -> Made your changes -> Updated your branch (from the trunk) to make sure you were up to date -> resolved any merge conflicts -> then merged back into the trunk... What part are you having trouble with? Are you asking that even after resolving the update conflicts when you were making sure you were up to date, whether or not you would get any more conflicts when merging back into the trunk?
– Chris
Dec 31 '18 at 20:02
If you're asking if merge conflicts occur when you're merging back into the trunk, the answer is yes. They can occur, doesn't mean it will though, especially if you've ensured you were up to date prior to merging. It's smart enough to handle a lot of scenarios, but it won't do all of them automatically. Depends on the amount/complexity of the changes.
– Chris
Dec 31 '18 at 20:03
Yes, that was my question, whether during the merge to the trunk (even after resolving the update conflicts) brings conflicts.
– shrin_monk
Jan 1 at 12:24