Re: com web/php: Merge branch 'master' of git://git.php.net/web/php: styles/theme-base.css
| From: | Levi Morrison | Date: | Tue, 10 Dec 2013 23:21:11 +0000 |
| Subject: | Re: com web/php: Merge branch 'master' of git://git.php.net/web/php: styles/theme-base.css | ||
| References: | 1 2 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-17482@lists.php.net to get a copy of this message | ||
Actually, this specific one happened because from the time I did
git pull
and git commit (very narrow window, I promise) a new commit came in. No
branching would have helped this time.
On Tue, Dec 10, 2013 at 4:18 PM, Hannes Magnusson <
hannes.magnusson@gmail.com> wrote:
> On Tue, Dec 10, 2013 at 3:07 PM, Levi Morrison <levim@php.net> wrote:
> > Commit: eb6caa671a8b8e0a58632c43709a3b18c2c74d13
> > Author: Levi Morrison <levim@php.net> Tue, 10 Dec 2013
> 16:07:15 -0700
> > Parents: e505d3062b584d14428fd401ffe74f5e0bdcead9
> b2eba34e4e46f53d3ff31d10190691ee31d2ddaa
> > Branches: master
> >
> > Link:
>
> http://git.php.net/?p=web/php.git;a=commitdiff;h=eb6caa671a8b8e0a58632c43709a3b18c2c74d13
> >
> > Log:
> > Merge branch 'master' of git://git.php.net/web/php
> >
>
>
> Please work in your own branch and then merge it into master, or
> rebase your commits before pushing.
>
> These "merged master into master" are not good.
>
> -Hannes
>