Open Stack

On 08/28/2014 07:11 PM, Matt Kassawara wrote:
> Can I still use your backport script or should I manually apply the patch?

You can use it and when you get the conflict, try to run:

git checkout stable/icehouse doc/glossary/glossar-terms.xml
git add doc/glossary/glossar-terms.xml
git merge --continue

The above is untested, see the output for details...

Andreas
-- 
 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126