I have a kernel patch for a different kernel version, so I'm trying to patch. Needless to say, the patch fails partially. I can definitely fix it manually, but I was thinking that maybe there is a graphical patch utility that can be used to solve conflicts.
dirdiff , they should be packaged for your distribution. Another useful tool is wiggle , which "Tough Efforts" to solve the conflicts, and inline paradox with a CJS-style >>> markers with packets.
I try to experiment with an underlying amendment system So, I'm happy to return the changes if they are wrong, as if I use it:
wiggle -v --replace & lt; file & gt; Lt; file.rej>
That tells you to make changes in place, sometimes it works right, other times you end with >>> marker And can be edited by hand, but using a rez file with hand is easy if it actually works poorly then I use my revision control system (GIT) to return to the original.
Comments
Post a Comment