Unfortunately it just rejects it entirely if there are any problems. My solution was to use the exclude flag to ignore all of the conflicting files (about a dozen) and deal with merging those individually after the patch. Steven
On Monday, August 31, 2015, Chris Hillery <[email protected]> wrote: > On Mon, Aug 31, 2015 at 11:42 AM, Steven Jacobs <[email protected] > <javascript:;>> wrote: > > > Is there a typo here: > > 4. Apply your tweaked patch: > > > > patch -p1 /tmp/my.patch > > > > Yeah, that should probably be > > patch -p1 < /tmp/my.patch > > > > > When I try this step my console stays alive indefinitely and doesn't > output > > anything. When I tried the method from Chris (git am), it tells me patch > > failed (with several errors of patch does not apply), and I can't seem to > > get around that. > > > That's a little surprising, although it could just be that you have some > legit merge conflicts that need to be addressed. If you want to ping me on > Skype (user: ceejatec) I can see if I can help out. > > Ceej > aka Chris Hillery >
