[PATCH 0/1] combo-layer + merge requests

[Patrick Ohly <patrick.ohly@intel.com>]

We are using combo-layer with repos hosted on Github, and we use the
"merge pull request" button from Github to import changes. This leads
to merge commits in our component history. Because we avoid
conflict resolution during merging, that mostly works, except for two edge
cases:
1. last_revision not recent enough for the next combo-layer run,
   patch available
2. a merge succeeds automatically (three-way merge), but "git am"
   then is more picky and rejects patches which do not apply cleanly.
   No solution for that yet; we'll have to be more careful about
   rebasing before merging.

The following changes since commit 2258345e19efff7717fe19a5026ec55f1b6f90b6:

  oe-selftest: devtool: add a proper test to see if tap devices exist (2015-05-07 14:59:15 +0100)

are available in the git repository at:

  git://github.com/pohly/openembedded-core master
  https://github.com/pohly/openembedded-core/tree/master

Patrick Ohly (1):
  combo-layer: improve merge commit handling

 scripts/combo-layer | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

-- 
2.1.4