Re: Integrating the folder change and package change into topic branches

[Steven Jacobs <sj...@ucr.edu>]

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 <ch...@hillery.land> wrote:

> On Mon, Aug 31, 2015 at 11:42 AM, Steven Jacobs <sjaco002@ucr.edu
> <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
>

Re: Integrating the folder change and package change into topic branches

[Steven Jacobs <sj...@ucr.edu>]

My advice to throw on top of what's here: Some of the files that I had
completely deleted on my local branch didn't get deleted when I did the
patch. The file renames and additions seemed to work fine, but the
deletions never happened. I would recommend checking on this after merges
on topic branches. I'm not sure exactly why this happened.
Steven

On Mon, Aug 31, 2015 at 7:09 PM, Steven Jacobs <sj...@ucr.edu> wrote:

> 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 <ch...@hillery.land> wrote:
>
>> On Mon, Aug 31, 2015 at 11:42 AM, Steven Jacobs <sj...@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
>>
>