So however you got a merge conflict. Your tree wasn't up to date.
I do not encounter any merge conflicts, is just that the branches is
not
merging. By checking my build, I notice that the valleyisland-io-1.0
branch has the same HEAD of standard/base (which means I don't see any
On 14-05-23 06:48 AM, Ong, Boon Leong wrote:
So however you got a merge conflict. Your tree wasn't up to date.
I do not encounter any merge conflicts, is just that the branches is
not
merging. By checking my build, I notice that the valleyisland-io-1.0
branch has the same HEAD of
SRCREV_machine ?= f53a6114b3a6e8c03ca4752de829887015f4c942
And retry ?
Retry on the new commit and git describe valleyisland-io-1.0 shows
v3.10.38-2618-g8ea4fb6.
Perfect! *Sherlock Holmes's* style of solving linux-yocto branch merge
mystery.
We are good now!
Thanks a bunch Bruce!
--
On 14-05-23 09:26 AM, Ong, Boon Leong wrote:
SRCREV_machine ?= f53a6114b3a6e8c03ca4752de829887015f4c942
And retry ?
Retry on the new commit and git describe valleyisland-io-1.0 shows
v3.10.38-2618-g8ea4fb6.
Perfect! *Sherlock Holmes's* style of solving linux-yocto branch merge
mystery.
We
From: Chang Rebecca Swee Fun rebecca.swee.fun.ch...@intel.com
Hi all,
This is the scenerio 1 that Boon Leong mentioned in the Feature Branch
planning email thread. This will be the feature branch that consists
of all patches that are queuing into 3.10 LTS/LTSI and also the so
called staging
] [Scenerio 1]
Enable feature branch for Valley Island features
On 2014-05-22, 6:09 AM, rebecca.swee.fun.ch...@intel.com wrote:
From: Chang Rebecca Swee Fun rebecca.swee.fun.ch...@intel.com
Hi all,
This is the scenerio 1 that Boon Leong mentioned in the Feature Branch
planning email
] [Scenerio 1]
Enable feature branch for Valley Island features
On 2014-05-22, 6:09 AM, rebecca.swee.fun.ch...@intel.com wrote:
From: Chang Rebecca Swee Fun rebecca.swee.fun.ch...@intel.com
Hi all,
This is the scenerio 1 that Boon Leong mentioned in the Feature Branch
planning email thread
: 23 May, 2014 10:20 AM
To: Chang, Rebecca Swee Fun; linux-yocto@yoctoproject.org
Subject: Re: [linux-yocto] [PATCH 00/24] [linux-yocto-3.10] [Scenerio 1]
Enable feature branch for Valley Island features
On 2014-05-22, 6:09 AM, rebecca.swee.fun.ch...@intel.com wrote:
From: Chang Rebecca Swee Fun
]
Sent: 23 May, 2014 10:20 AM
To: Chang, Rebecca Swee Fun; linux-yocto@yoctoproject.org
Subject: Re: [linux-yocto] [PATCH 00/24] [linux-yocto-3.10]
[Scenerio 1] Enable feature branch for Valley Island features
On 2014-05-22, 6:09 AM, rebecca.swee.fun.ch...@intel.com wrote:
From: Chang Rebecca
