[dmd-internals] [D-Programming-Language/dmd] 47260a: Merge pull request #2101 from 9rnsr/fix10212
Jacob Carlborg
doob at me.com
Sun Jun 2 02:25:26 PDT 2013
On 2 jun 2013, at 02:18, Walter Bright <walter at digitalmars.com> wrote:
> Oh, so *that's* what went wrong! This is entirely my fault.
>
> I was pushing one of the regressions to 2.063, and github kept saying:
>
> ----------------------------------
> mercury ~/dpl/dmd> git push origin 2.063
> To git at github.com:D-Programming-Language/dmd.git
> ! [rejected] 2.063 -> 2.063 (non-fast-forward)
> error: failed to push some refs to 'git at github.com:D-Programming-Language/dmd.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again. See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> -----------------------------------
>
> git status, of course, told me nothing, so I tried git push -f.
>
> Sorry.
You need to sync with upstream first before you can run "git status". You can do that with "git fetch upstream".
--
/Jacob Carlborg
More information about the dmd-internals
mailing list