From mikma264 at gmail.com Wed Sep 5 00:03:31 2012 From: mikma264 at gmail.com (Mikael Magnusson) Date: Wed, 05 Sep 2012 00:03:31 +0200 Subject: [Yxa-devel] Status In-Reply-To: References: <5040ADBB.4050401@gmail.com> <5040AFA4.1040406@gmail.com> <5040BA4B.5090402@gmail.com> <5040BD1D.3050308@gmail.com> <5040D102.5010905@gmail.com> <5040D9A7.2070104@gmail.com> Message-ID: <50467AB3.3030500@gmail.com> On 08/31/2012 09:00 PM, CGS wrote: > Here it is: > > Repo: https://github.com/cgsmcmlxxv/yxa.git > Branch: otp-r15a > > (git fetch 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 master instead? /Mikael From cgsmcmlxxv at gmail.com Wed Sep 5 09:42:43 2012 From: cgsmcmlxxv at gmail.com (CGS) Date: Wed, 5 Sep 2012 09:42:43 +0200 Subject: [Yxa-devel] Status In-Reply-To: <50467AB3.3030500@gmail.com> References: <5040ADBB.4050401@gmail.com> <5040AFA4.1040406@gmail.com> <5040BA4B.5090402@gmail.com> <5040BD1D.3050308@gmail.com> <5040D102.5010905@gmail.com> <5040D9A7.2070104@gmail.com> <50467AB3.3030500@gmail.com> Message-ID: I will do it this evening. CGS On Wed, Sep 5, 2012 at 12:03 AM, Mikael Magnusson wrote: > On 08/31/2012 09:00 PM, CGS wrote: > >> Here it is: >> >> Repo: https://github.com/cgsmcmlxxv/**yxa.git >> Branch: otp-r15a >> >> (git fetch https://github.com/cgsmcmlxxv/**yxa.gitotp-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.**gitmaster instead? > > /Mikael > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From cgsmcmlxxv at gmail.com Wed Sep 5 18:35:37 2012 From: cgsmcmlxxv at gmail.com (CGS) Date: Wed, 5 Sep 2012 18:35:37 +0200 Subject: [Yxa-devel] Status In-Reply-To: <50467AB3.3030500@gmail.com> References: <5040ADBB.4050401@gmail.com> <5040AFA4.1040406@gmail.com> <5040BA4B.5090402@gmail.com> <5040BD1D.3050308@gmail.com> <5040D102.5010905@gmail.com> <5040D9A7.2070104@gmail.com> <50467AB3.3030500@gmail.com> Message-ID: It was a problem with my branch because I couldn't compare my branch with the master branch. It should work now. CGS On Wed, Sep 5, 2012 at 12:03 AM, Mikael Magnusson wrote: > On 08/31/2012 09:00 PM, CGS wrote: > >> Here it is: >> >> Repo: https://github.com/cgsmcmlxxv/**yxa.git >> Branch: otp-r15a >> >> (git fetch https://github.com/cgsmcmlxxv/**yxa.gitotp-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.**gitmaster instead? > > /Mikael > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fredrik at thulin.net Mon Sep 24 13:27:36 2012 From: fredrik at thulin.net (Fredrik Thulin) Date: Mon, 24 Sep 2012 13:27:36 +0200 Subject: [Yxa-devel] yxa contracting available Message-ID: <1348486056.13910.5.camel@ft-laptop> Hi all, it's been a while. After 18 months of absence from YXA (I was away in the IT security business) I've recently started my own consulting firm. If anyone is interested in contracting me (maintenance contract for YXA, systems design or developing something custom you need), feel free to contact me off list. fredrik at thulin.net in case the web archives hide my e-mail address. /Fredrik From jakob at kirei.se Mon Sep 24 13:39:08 2012 From: jakob at kirei.se (Jakob Schlyter) Date: Mon, 24 Sep 2012 13:39:08 +0200 Subject: [Yxa-devel] yxa contracting available In-Reply-To: <1348486056.13910.5.camel@ft-laptop> References: <1348486056.13910.5.camel@ft-laptop> Message-ID: <896A6A84-F284-4AFE-ABCC-3E37FDA0C587@kirei.se> Good to have you back Fredrik! jakob -- Jakob Schlyter Kirei AB - http://www.kirei.se/ From pf at leissner.se Mon Sep 24 13:43:35 2012 From: pf at leissner.se (=?iso-8859-1?Q?Peter_F=E4ssberg?=) Date: Mon, 24 Sep 2012 11:43:35 +0000 Subject: [Yxa-devel] yxa contracting available In-Reply-To: <896A6A84-F284-4AFE-ABCC-3E37FDA0C587@kirei.se> Message-ID: <95009A2F73A1894F975CCFB7312C4137E5DB8D@DC01.leissner.se> +1 // Peter ----- Ursprungligt meddelande ---- Fr?n: Jakob Schlyter [mailto:jakob at kirei.se] Skickat: Monday, September 24, 2012 01:39 PM Till: Fredrik Thulin Kopia: Yxa-devel ?mne: Re: [Yxa-devel] yxa contracting available Good to have you back Fredrik! jakob -- Jakob Schlyter Kirei AB - http://www.kirei.se/ _______________________________________________ Yxa-devel mailing list Yxa-devel at lists.su.se https://lists.su.se/mailman/listinfo/yxa-devel