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 <mikma...@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 > >
_______________________________________________ Yxa-devel mailing list Yxa-devel@lists.su.se https://lists.su.se/mailman/listinfo/yxa-devel
