Open Stack

Git complains with your first command. Can you walk me through this?


On Thu, Aug 28, 2014 at 12:25 PM, Andreas Jaeger <aj at suse.com> wrote:

> 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20140828/e72ffb6d/attachment-0001.html>