[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Unable to merge staging
From: |
Francisco Vila |
Subject: |
Re: Unable to merge staging |
Date: |
Thu, 13 Feb 2014 10:31:06 +0100 |
2014-02-13 10:13 GMT+01:00 David Kastrup <address@hidden>:
> Francisco pushed commits directly to master instead of staging.
Oh.
> I've
> taken a look through the commits, but at least
>
> commit b8f58d9897229562d1fb2dc558f8f4309005008d
> Author: Francisco Vila <address@hidden>
> Date: Fri Feb 7 12:01:47 2014 +0100
>
> Doc: misplaced comments produce wrong HTML output.
>
> is totally wrong (I don't think was ever entered into review and cannot
> find the commit id in the issue tracker) since the problems will get
> reintroduced when makelsr is getting run: the problems need to get fixed
> in Documentation/snippets/new instead and propagated with makelsr.
The patch was labeled 'push' but then, following the comments to the
patch, I made the changes to snippets/new and snippets/. There should
be no problem besides my mistake of pushing to master, which I
apologize for.
> If not, more reverts will be required.
I pushed three commits.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com
- Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging, David Kastrup, 2014/02/13
- Re: Unable to merge staging, Phil Holmes, 2014/02/13
- Re: Unable to merge staging,
Francisco Vila <=
- Re: Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging, Francisco Vila, 2014/02/13
- Re: Unable to merge staging, Phil Holmes, 2014/02/13
- Re: Unable to merge staging, James, 2014/02/13