[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-doc-english
Subject: Re: Regarding using KDiff3 merging tool
From: Prashant Pahurkar <prashant.pahurkar () gmail ! com>
Date: 2016-08-10 11:28:18
Message-ID: CADpUMdnrZpuDvYn7miwS4=fHH198T=CGTSRSqid0E99EuDVqxA () mail ! gmail ! com
[Download RAW message or body]
Hi Burkhard,
Thanks for the reply.
I have gone through the link you have shared but what I am looking out is
somewhat different and is as follows:
1. I want to merge 2 files and auto resolve the conflict without any
manunal intervention.
Lets say I will provide the input as:- In Conflict situation it should
always pick it up from File A and override.
Is it possible without manual intervention.
I guess this is possible by Manual intervention i.e. by choosing the
option of selecting "Choose A from everywhere" - but how to achieve this
without manual intervention.
It means how do I default or set the "Choose A from everywhere" option
before hand.
2. In the above example how do I set this option when calling KDiff3 from
command prompt.
For eg:
I am using a batch file and using the following command
call "C:\Program Files\kdiff3\kdiff3.exe" "C:\Users\xx\Documents\Rnd
Learning\n1.txt" "C:\Users\xx\Documents\Rnd Learning\n2.txt"
-o "C:\Users\xx\Documents\Rnd Learning\n3.txt"
How do I get the merge output in n3.txt which will have the merge product
of n1.txt and n2.txt?
How do I set the option of "Choose A from everywhere" through the command
prompt i.e What should I add in the above command line to achieve the
"Choose A from everywhere" option.
Awaiting your reply.
Regards,
Prashant
On Tue, Aug 9, 2016 at 7:58 PM, Burkhard L=C3=BCck <lueck@hube-lueck.de> wr=
ote:
> Am Dienstag, 9. August 2016, 18:21:02 CEST schrieb Prashant Pahurkar:
> > Hi,
> >
> > I have certain doubts and clarification required wrt using KDiff3 tool =
as
> > follows:
> > 1. I want to merge 2 files and auto resolve the conflict by adding firs=
t
> > lines from File A and then appending it with Lines from B. Is it possib=
le
> > without manual intervention.
> > 2. Also Can i achieve the same using command prompt.
> > For ex: I am using a batch file and using the following command
> > call "C:\Program Files\kdiff3\kdiff3.exe" --auto
> > "C:\Users\296170\Documents\Rnd Learning\n1.txt"
> > "C:\Users\296170\Documents\Rnd Learning\n2.txt" -o
> > "C:\Users\296170\Documents\Rnd Learning\n3.txt"
> >
> > This will display the page where it will ask me to select from File A o=
r
> B
> > to resolve the conflict. But through command prompt I would like to get
> the
> > merge output in n3.txt which will have the merge product of n1.txt and
> > n2.txt.
> > Please let me know if this is possible and what would be the command to
> > achieve this?
> >
> Please read https://docs.kde.org/trunk4/en/extragear-utils/kdiff3/
> documentation.html#commandline
>
> --
> Burkhard L=C3=BCck
>
>
[Attachment #3 (text/html)]
<div dir="ltr"><div><div>Hi Burkhard,</div><div><br></div><div>Thanks for the \
reply.</div><div>I have gone through the link you have shared but what I am looking \
out is somewhat different and is as follows:</div><div>1. <font color="#000000" \
face="Times New Roman" size="3">I want to merge 2 files and auto resolve the conflict \
without any manunal intervention.</font></div><div><font color="#000000" face="Times \
New Roman" size="3">Lets say I will provide the input as:- In Conflict situation it \
should always pick it up from File A and override.</font></div><div><font \
color="#000000" face="Times New Roman" size="3">Is it possible without manual \
intervention.</font><font color="#000000" face="Times New Roman" size="3"> \
</font></div><div><font color="#000000" face="Times New Roman" size="3">I guess this \
is possible by Manual intervention i.e. by choosing the option of selecting \
"Choose A from everywhere" - but how to achieve this without manual \
intervention.</font></div><div><font color="#000000" face="Times New Roman" \
size="3">It means how do I default or set the "Choose A from everywhere" \
option before hand.</font></div><div><font color="#000000" face="Times New Roman" \
size="3"><br></font></div><div><font color="#000000" face="Times New Roman" \
size="3">2. In the above example how do I set this option when calling KDiff3 from \
command prompt.</font></div><div><font color="#000000" face="Times New Roman" \
size="3">For eg:</font></div><div><font color="#000000" face="Times New Roman" \
size="3"><span style="font-family:"Times New Roman",serif;font-size:12pt">I \
am using a batch file and using the following command<br> call "C:\Program \
Files\kdiff3\kdiff3.exe" "C:\Users\xx\Documents\Rnd Learning\n1.txt" \
"C:\Users\xx\Documents\Rnd Learning\n2.txt" -o \
"C:\Users\xx\Documents\Rnd Learning\n3.txt"</span></font></div><div><font \
color="#000000" face="Times New Roman" size="3"><span style="font-family:"Times \
New Roman",serif;font-size:12pt"><span style="font-family:"Times New \
Roman",serif;font-size:12pt">How do I get the merge output in n3.txt which will \
have the merge product of n1.txt and n2.txt?</span></span></font></div><div><font \
color="#000000" face="Times New Roman" size="3"><span style="font-family:"Times \
New Roman",serif;font-size:12pt"><span style="font-family:"Times New \
Roman",serif;font-size:12pt">How do I set the option of "Choose A from \
everywhere" through the command prompt i.e What should I add in the above \
command line to achieve the "Choose A from everywhere" \
option.</span></span></font></div><div><font color="#000000" face="Times New Roman" \
size="3">Awaiting your reply.</font></div><div><font color="#000000" face="Times New \
Roman" size="3"><br></font></div><div><font color="#000000" face="Times New Roman" \
size="3">Regards,</font></div><div><font color="#000000" face="Times New Roman" \
size="3">Prashant</font></div></div><div class="gmail_extra"><br><div \
class="gmail_quote">On Tue, Aug 9, 2016 at 7:58 PM, Burkhard Lück <span \
dir="ltr"><<a href="mailto:lueck@hube-lueck.de" \
target="_blank">lueck@hube-lueck.de</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;padding-left:1ex;border-left-color:rgb(204,204,204);border-left-width:1px;border-left-style:solid"><span>Am \
Dienstag, 9. August 2016, 18:21:02 CEST schrieb Prashant Pahurkar:<br> > Hi,<br>
><br>
> I have certain doubts and clarification required wrt using KDiff3 tool as<br>
> follows:<br>
> 1. I want to merge 2 files and auto resolve the conflict by adding first<br>
> lines from File A and then appending it with Lines from B. Is it possible<br>
> without manual intervention.<br>
> 2. Also Can i achieve the same using command prompt.<br>
> For ex: I am using a batch file and using the following command<br>
> call "C:\Program Files\kdiff3\kdiff3.exe" --auto<br>
> "C:\Users\296170\Documents\Rnd Learning\n1.txt"<br>
> "C:\Users\296170\Documents\Rnd Learning\n2.txt" -o<br>
> "C:\Users\296170\Documents\Rnd Learning\n3.txt"<br>
><br>
> This will display the page where it will ask me to select from File A or B<br>
> to resolve the conflict. But through command prompt I would like to get the<br>
> merge output in n3.txt which will have the merge product of n1.txt and<br>
> n2.txt.<br>
> Please let me know if this is possible and what would be the command to<br>
> achieve this?<br>
><br>
</span>Please read <a href="https://docs.kde.org/trunk4/en/extragear-utils/kdiff3/
documentation.html#commandline" target="_blank" \
rel="noreferrer">https://docs.kde.org/trunk4/<wbr>en/extragear-utils/kdiff3/<br> \
documentation.html#commandline</a><br> <span><font color="#888888"><br>
--<br>
Burkhard Lück<br>
<br>
</font></span></blockquote></div><br></div></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic