[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git conflicts
From: |
John Mandereau |
Subject: |
Re: Git conflicts |
Date: |
Fri, 20 Jun 2008 23:09:02 +0200 |
On 2008/06/20, Rune Zedeler wrote:
> Unfortunately I ofcourse cannot push onto origin - (error: remote
> 'refs/heads/dev/rune' is not a strict subset of local ref
> 'refs/heads/dev/rune'.)
>
> Should I "push -f" ?
IIRC this is not allowed on git.sv.gnu.org. If you really want to do
this (it seems to be the case, although I didn't catch all details of
the story), delete dev/run on git.sv.gnu.org
git push ssh://address@hidden/srv/git/lilypond.git :dev/rune
then push as usual, which will recreate branch dev/rune.
HTH,
John
- Re: Git conflicts, (continued)
- Re: Git conflicts, Rune Zedeler, 2008/06/19
- Re: Git conflicts, Valentin Villenave, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Valentin Villenave, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Johannes Schindelin, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts,
John Mandereau <=
- Re: Git conflicts, Rune Zedeler, 2008/06/22
- Re: Git conflicts, Valentin Villenave, 2008/06/22
Re: Git conflicts, Rune Zedeler, 2008/06/21
Re: Git conflicts, Johannes Schindelin, 2008/06/21
Re: Git conflicts, Rune Zedeler, 2008/06/22
Re: Git conflicts, Johannes Schindelin, 2008/06/22