Timeline for how to use patch and diff to merge two files and automatically resolve conflicts
Current License: CC BY-SA 3.0
5 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jun 13, 2018 at 1:08 | comment | added | CMCDragonkai | Apparently diff3 works the same way. Requiring a common ancestor file. Why is there no simple CLI tool that just merges 2 files together based on what diff shows. | |
| Feb 2, 2013 at 12:22 | comment | added | vonbrand | @alzheimer, whip up something simple to show us... | |
| Feb 2, 2013 at 12:06 | comment | added | frostschutz | for the optimal solution in this case you'd have to parse the XML, with a real XML parser not the hacks above, and produce a new merged XML output from that. diff / patch / sort etc. are just all hacks tailored to "particular examples", for a general solution they're simply the wrong tools | |
| Feb 2, 2013 at 2:16 | comment | added | Rafael T | does work in this particular example, but NOT in general: If the name in_b_but_different_val has a value of #00AABB sort will put that on top and erases the second value instead of the first one | |
| Feb 2, 2013 at 1:29 | history | answered | vonbrand | CC BY-SA 3.0 |