[Yxa-devel] Status

[CGS]

I will do it this evening.

CGS



On Wed, Sep 5, 2012 at 12:03 AM, Mikael Magnusson <mikma264 at gmail.com>wrote:

> On 08/31/2012 09:00 PM, CGS wrote:
>
>> Here it is:
>>
>> Repo: https://github.com/cgsmcmlxxv/**yxa.git<https://github.com/cgsmcmlxxv/yxa.git>
>> Branch: otp-r15a
>>
>> (git fetch https://github.com/cgsmcmlxxv/**yxa.git<https://github.com/cgsmcmlxxv/yxa.git>otp-r15a)
>>
>> CGS
>>
>
> I have merged my otp-r14a branch into my master. And tried to merge
> otp-r15a, but failed. I see your branch is created from a fork with a lot
> of changes not preset in upstream yxa. Do you think you can create a branch
> based on https://github.com/mikma/yxa.**git<https://github.com/mikma/yxa.git>master instead?
>
> /Mikael
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.su.se/pipermail/yxa-devel/attachments/20120905/592c3c14/attachment.html>