[procps] Re: first part of nls
- From: Sami Kerola <kerolasa@xxxxxx>
- To: procps@xxxxxxxxxxxxx
- Date: Thu, 22 Dec 2011 08:51:39 +0100
On Thu, Dec 22, 2011 at 06:44, Jim Warner <james.warner@xxxxxxxxxxx> wrote:
> On Dec 21, 2011, at 8:04 PM, Craig Small wrote:
>
>> It's not but it can be done afterwards. I tried it on a separate clone
>> and it worked fine with a few conflict tweaks. Here is git lola
>> ...
>> That looks right, it compiles and has the history.
>> As far as 31 patches versus 25, I only got 25.
>> It looks like the history was
>> top_nls
>> sami_nls
>> and now it is
>> sami_nls
>> top_nls
>>
>> but it is all there.
>
> There should be no conflicts and thus no tweaks.
My local master is
commit 4ece57b53e698d1365f720a972f224d0ddb81a66
$ git merge sami/nls master
Trying simple merge with sami/nls
Simple merge did not work, trying automatic merge.
Auto-merging .gitignore
Auto-merging Makefile.am
ERROR: content conflict in Makefile.am
Auto-merging autogen.sh
Auto-merging configure.ac
ERROR: content conflict in configure.ac
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.
So one else's turn to fix.
--
Sami Kerola
http://www.iki.fi/kerolasa/
Other related posts:
