Kdiff3 show conflict even that files have equal text and are binary equals
Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge):
Total number of conflicts: 0
Nr of automatically solved conflicts: 0
Nr of unsolved conflicts: 0
kdiff3 files a and b have equal text
and all that is true but why should i save all those equal files manually?
diff merge
edited Mar 13 '14 at 19:28
Avinash R
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
|
show 3 more comments
Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge):
Total number of conflicts: 0
Nr of automatically solved conflicts: 0
Nr of unsolved conflicts: 0
kdiff3 files a and b have equal text
and all that is true but why should i save all those equal files manually?
diff merge
edited Mar 13 '14 at 19:28
Avinash R
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
What doesgit diffshow?
– Avinash R
Mar 12 '14 at 13:12
I don't use it ingitcontext.
– Sebastian Piskorski
Mar 13 '14 at 17:47
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31
|
show 3 more comments
Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge):
Total number of conflicts: 0
Nr of automatically solved conflicts: 0
Nr of unsolved conflicts: 0
kdiff3 files a and b have equal text
and all that is true but why should i save all those equal files manually?
diff merge
edited Mar 13 '14 at 19:28
Avinash R
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge):
Total number of conflicts: 0
Nr of automatically solved conflicts: 0
Nr of unsolved conflicts: 0
kdiff3 files a and b have equal text
and all that is true but why should i save all those equal files manually?
diff merge
diff merge
edited Mar 13 '14 at 19:28
Avinash R
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
edited Mar 13 '14 at 19:28
Avinash R
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
edited Mar 13 '14 at 19:28
Avinash R
1936
edited Mar 13 '14 at 19:28
Avinash R
1936
edited Mar 13 '14 at 19:28
Avinash R
1936
1936
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
asked Mar 8 '14 at 20:47
Sebastian PiskorskiSebastian Piskorski
12915
12915
What doesgit diffshow?
– Avinash R
Mar 12 '14 at 13:12
I don't use it ingitcontext.
– Sebastian Piskorski
Mar 13 '14 at 17:47
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31
|
show 3 more comments
What doesgit diffshow?
– Avinash R
Mar 12 '14 at 13:12
I don't use it ingitcontext.
– Sebastian Piskorski
Mar 13 '14 at 17:47
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31
What does
git diff show?– Avinash R
Mar 12 '14 at 13:12
What does
git diff show?– Avinash R
Mar 12 '14 at 13:12
I don't use it in
git context.– Sebastian Piskorski
Mar 13 '14 at 17:47
I don't use it in
git context.– Sebastian Piskorski
Mar 13 '14 at 17:47
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31
|
show 3 more comments
1 Answer
1
active
oldest
votes
Kdiff3 can't handle some caracters (the ones with accents...).
It is supposed to work with the diffrent encoding but it bypass the letters it doesn't support.
If you need an entire file from place A to B, copy and paste it to be sure ;)
answered Sep 23 '15 at 14:29
DamienDamien
1
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
add a comment |
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "3"
};
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%2fsuperuser.com%2fquestions%2f726462%2fkdiff3-show-conflict-even-that-files-have-equal-text-and-are-binary-equals%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
Kdiff3 can't handle some caracters (the ones with accents...).
It is supposed to work with the diffrent encoding but it bypass the letters it doesn't support.
If you need an entire file from place A to B, copy and paste it to be sure ;)
answered Sep 23 '15 at 14:29
DamienDamien
1
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
add a comment |
Kdiff3 can't handle some caracters (the ones with accents...).
It is supposed to work with the diffrent encoding but it bypass the letters it doesn't support.
If you need an entire file from place A to B, copy and paste it to be sure ;)
answered Sep 23 '15 at 14:29
DamienDamien
1
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
add a comment |
Kdiff3 can't handle some caracters (the ones with accents...).
It is supposed to work with the diffrent encoding but it bypass the letters it doesn't support.
If you need an entire file from place A to B, copy and paste it to be sure ;)
answered Sep 23 '15 at 14:29
DamienDamien
1
Kdiff3 can't handle some caracters (the ones with accents...).
It is supposed to work with the diffrent encoding but it bypass the letters it doesn't support.
If you need an entire file from place A to B, copy and paste it to be sure ;)
answered Sep 23 '15 at 14:29
DamienDamien
1
answered Sep 23 '15 at 14:29
DamienDamien
1
answered Sep 23 '15 at 14:29
DamienDamien
1
answered Sep 23 '15 at 14:29
DamienDamien
1
1
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
add a comment |
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
Copying and pasting isn't the best idea, because clipboard may change encoding. For example, Windows clipboard always changes encoding of characters to UTF-8.
– Sebastian Piskorski
Sep 24 '15 at 11:22
add a comment |
Thanks for contributing an answer to Super User!
- 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%2fsuperuser.com%2fquestions%2f726462%2fkdiff3-show-conflict-even-that-files-have-equal-text-and-are-binary-equals%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
What does
git diffshow?– Avinash R
Mar 12 '14 at 13:12
I don't use it in
gitcontext.– Sebastian Piskorski
Mar 13 '14 at 17:47
Then shouldn't git be removed from the tags?
– Avinash R
Mar 13 '14 at 19:16
Yes you're right. I just couldn't create new tag and so I used git instead. I admit it wasn't best idea.
– Sebastian Piskorski
Mar 13 '14 at 19:28
K3diff tag couldn't be used by me neither, so i used a diff tag. On a different note, what does diff (terminal) show? Maybe it's just an empty space/bug in k3diff
– Avinash R
Mar 13 '14 at 19:31