Apply patchs

Open danilovicente opened this issue 3 years ago • 2 comments

Hello guys,

I don't know if I being stupid or what, but I only able to apply one patch. It's possible to use more than one? I'm applying like this

curl https://patch-diff.githubusercontent.com/raw/dudik/herbe/pull/25.diff | git apply

What am I doing wrong?

Mar 11 '22 11:03 danilovicente

If you're getting conflicts, then you'll have to resolve them manually. Try curl -L "https://github.com/dudik/herbe/pull/25.patch" | git am --reject , then manually solve the conflicts. Once done, run git am --continue otherwise git am --abort to give up.

Using git am instead of git apply has the benefit of preserving the commit author and msg.

Mar 13 '22 12:03 N-R-K

I'm really bad at coding. I even forgot about this Issue, could someone help me? I was trying to patch the Xresources, dynamic content, and vertical stacking.

Jun 02 '22 11:06 danilovicente