Page 1 of 1

will WinMerge actually merge 2 files...

PostPosted: Mon Apr 20, 2020 10:14 pm
by spaceace
i design phpBB styles and also make a few extensions. that said, i'm wondering if WinMerge can actually merge the contents of 2 files as in the following example...

file1.css contains this
Code: Select all
.wrap {
   border: 10px;
}


file2.css contains this
Code: Select all
.wrap {
   background-color: #FFFFFF;
}


after WinMerge gets done, i end up with this in for example file3.css
Code: Select all
.wrap {
   border: 10px;
   background-color: #FFFFFF;
}


thus actually merging the 2 classes from the 2 files.

is this possible or is it a feature request that can be made somewhere?

if it is possible, how?

Re: will WinMerge actually merge 2 files...

PostPosted: Tue May 12, 2020 5:17 pm
by duncfro
I'm also struggling to get the tool to actually merge files. If I have 2 C++ files that source control is reporting a conflict from, there doesn't seem to be any combination of arguments to WinMergeU.exe that allows automatic merging of non-conflicting lines relative to base, and easy resolution of conflicting lines with a 3-pane view of [theirs | merge | yours] that saves to a result file. It seems like the mergefile produced by source control could be utilized, but the format of the file in my source control (Perforce) doesn't appear to be supported as a conflict file.

Are there any detailed instructions for getting a 3-way auto-merge working, with conflicts left unresolved for manual resolution in the tool?