On Thu, Apr 09, 2015 at 05:47:51PM +0200, Dominique Dumont wrote:
> On Thursday 09 April 2015 09:21:24 Darryl L. Pierce wrote:
> > I've been following the steps as best I can here [1] to upgrade my
> > package (qpid-proton) to the latest upstream release (0.9). However,
> > these steps result in a
On Thu, 09 Apr 2015 17:47:51 +0200, Dominique Dumont wrote:
> > What is the right way to go about this?
> First, fix your git repo before attempting an import:
> - watch file is broken
> - several files have git merge artifacts (try a «ack '<<<'» in your repo)
> - upstream and pristine-tar branche
On Thursday 09 April 2015 09:21:24 Darryl L. Pierce wrote:
> I've been following the steps as best I can here [1] to upgrade my
> package (qpid-proton) to the latest upstream release (0.9). However,
> these steps result in a merge commit (actually, they result in a huge
> set of conflicts) and that
I've been following the steps as best I can here [1] to upgrade my
package (qpid-proton) to the latest upstream release (0.9). However,
these steps result in a merge commit (actually, they result in a huge
set of conflicts) and that strikes me as a Bad Thing (tm).
Why does GBP try to merge, rather
4 matches
Mail list logo
