Re: [git-users] I don't know how to from rej file to adjust the source

Hi Konstantin, It's a .ref file, I don't know where the conflict comes from, and how to adjust the file to remove this conflict, in other words. I don't understand the rej file mean to me Lei On Fri, May 16, 2014 at 6:07 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri,

[git-users] I don't know how to from rej file to adjust the source

#cat recipes-devtools/python/python-heat_git.bb.rej diff a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/ python-heat_git.bb(rejected hunks) @@ -10,6 +10,9 @@ SRCNAME = heat SRC_URI =

Re: [git-users] I don't know how to from rej file to adjust the source

On Fri, 16 May 2014 17:21:10 +0800 lei yang yanglei.f...@gmail.com wrote: #cat recipes-devtools/python/python-heat_git.bb.rej diff a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/ python-heat_git.bb(rejected hunks) @@ -10,6 +10,9 @@