Timeline for how to use patch and diff to merge two files and automatically resolve conflicts
Current License: CC BY-SA 4.0
16 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Apr 17, 2020 at 7:03 | answer | added | carlos duarte | timeline score: -1 | |
| Sep 20, 2019 at 8:57 | history | edited | Ciro Santilli OurBigBook.com | CC BY-SA 4.0 | automated conflict resolution to title |
| Oct 22, 2018 at 15:52 | history | edited | Rafael T | CC BY-SA 4.0 | typo fix |
| Apr 19, 2018 at 5:28 | answer | added | Cody Allan Taylor | timeline score: 8 | |
| S Sep 25, 2017 at 7:00 | history | suggested | rjt | just added tag xml | |
| Sep 25, 2017 at 6:48 | review | Suggested edits | |||
| S Sep 25, 2017 at 7:00 | |||||
| Feb 3, 2013 at 22:10 | vote | accept | Rafael T | ||
| Feb 2, 2013 at 13:37 | comment | added | alexis | Why all the answers with custom scripts? Merging is a standard and complex problem, and there are good tools for it. Don't reinvent the wheel. | |
| Feb 2, 2013 at 12:42 | answer | added | frostschutz | timeline score: 0 | |
| Feb 2, 2013 at 12:31 | answer | added | frostschutz | timeline score: 1 | |
| Feb 2, 2013 at 12:23 | answer | added | alexis | timeline score: 29 | |
| Feb 2, 2013 at 12:05 | comment | added | tripleee | diff can tell you which lines are in one file but not the other, but only on the granularity of entire lines. patch is only suitable for making the same changes to a similar file (perhaps a different version of the same file, or an entirely different file where however the line numbers and surrounding lines for each change are identical to your original file). So no, they are not particularly suitable for this task. You might want to have a look at wdiff but the solution probably requires a custom script. Since your data looks like XML, you might want to look for some XSL tool. | |
| Feb 2, 2013 at 10:39 | answer | added | neurino | timeline score: 1 | |
| Feb 2, 2013 at 2:47 | answer | added | vonbrand | timeline score: 0 | |
| Feb 2, 2013 at 1:29 | answer | added | vonbrand | timeline score: 6 | |
| Feb 2, 2013 at 1:00 | history | asked | Rafael T | CC BY-SA 3.0 |