asterixdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chris Hillery <chill...@hillery.land>
Subject Re: Integrating the folder change and package change into topic branches
Date Mon, 31 Aug 2015 21:49:54 GMT
On Mon, Aug 31, 2015 at 11:42 AM, Steven Jacobs <sjaco002@ucr.edu> 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

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message