Merging 3 XML files with kdiff3 (Command Line)
I need 3-way-merge of xml file, for this I am using kdiff3. The problem I am facing with kdiff3 is whenever there is the conflict in merging, kdiff3 is opening the kdiff3-GUI tool and ask to resolve a conflict. Kdiff3 is not saving the file with the conflict.
How can I ask kdiff3 to save the file with conflict?
I am using the following command
kdiff3 --auto -m -o merged.xml base.xml 1.xml 2.xml
xml matching kdiff3
asked Nov 26 '18 at 10:08
SanketSanket
601516
add a comment |
I need 3-way-merge of xml file, for this I am using kdiff3. The problem I am facing with kdiff3 is whenever there is the conflict in merging, kdiff3 is opening the kdiff3-GUI tool and ask to resolve a conflict. Kdiff3 is not saving the file with the conflict.
How can I ask kdiff3 to save the file with conflict?
I am using the following command
kdiff3 --auto -m -o merged.xml base.xml 1.xml 2.xml
xml matching kdiff3
asked Nov 26 '18 at 10:08
SanketSanket
601516
add a comment |
I need 3-way-merge of xml file, for this I am using kdiff3. The problem I am facing with kdiff3 is whenever there is the conflict in merging, kdiff3 is opening the kdiff3-GUI tool and ask to resolve a conflict. Kdiff3 is not saving the file with the conflict.
How can I ask kdiff3 to save the file with conflict?
I am using the following command
kdiff3 --auto -m -o merged.xml base.xml 1.xml 2.xml
xml matching kdiff3
asked Nov 26 '18 at 10:08
SanketSanket
601516
I need 3-way-merge of xml file, for this I am using kdiff3. The problem I am facing with kdiff3 is whenever there is the conflict in merging, kdiff3 is opening the kdiff3-GUI tool and ask to resolve a conflict. Kdiff3 is not saving the file with the conflict.
How can I ask kdiff3 to save the file with conflict?
I am using the following command
kdiff3 --auto -m -o merged.xml base.xml 1.xml 2.xml
xml matching kdiff3
xml matching kdiff3
asked Nov 26 '18 at 10:08
SanketSanket
601516
asked Nov 26 '18 at 10:08
SanketSanket
601516
edited Nov 26 '18 at 12:32
Sanket
asked Nov 26 '18 at 10:08
SanketSanket
601516
asked Nov 26 '18 at 10:08
SanketSanket
601516
asked Nov 26 '18 at 10:08
SanketSanket
601516
601516
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
Same can be achieved by git. Find below the command for this,
git merge-file -p mine.txt parent.txt yours.txt
-p Send results to standard output instead of overwriting <current-file>.
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
add a comment |
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%2f53478816%2fmerging-3-xml-files-with-kdiff3-command-line%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
Same can be achieved by git. Find below the command for this,
git merge-file -p mine.txt parent.txt yours.txt
-p Send results to standard output instead of overwriting <current-file>.
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
add a comment |
Same can be achieved by git. Find below the command for this,
git merge-file -p mine.txt parent.txt yours.txt
-p Send results to standard output instead of overwriting <current-file>.
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
add a comment |
Same can be achieved by git. Find below the command for this,
git merge-file -p mine.txt parent.txt yours.txt
-p Send results to standard output instead of overwriting <current-file>.
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
Same can be achieved by git. Find below the command for this,
git merge-file -p mine.txt parent.txt yours.txt
-p Send results to standard output instead of overwriting <current-file>.
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
answered Dec 4 '18 at 14:04
San GlobSan Glob
262
262
add a comment |
add a comment |
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%2f53478816%2fmerging-3-xml-files-with-kdiff3-command-line%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
