Hi,
On Wed, 13 Jun 2007, Gerrit Pape wrote:
> On Wed, Jun 13, 2007 at 01:58:51PM +0100, Johannes Schindelin wrote:
> > On Wed, 13 Jun 2007, Gerrit Pape wrote:
> > > $ git checkout master
> > > Switched to branch "master"
> > > $ git cherry-pick 8ddc4d5
> > > CONFLICT (file/directory): There i
On Wed, Jun 13, 2007 at 01:58:51PM +0100, Johannes Schindelin wrote:
> On Wed, 13 Jun 2007, Gerrit Pape wrote:
> > $ git checkout master
> > Switched to branch "master"
> > $ git cherry-pick 8ddc4d5
> > CONFLICT (file/directory): There is a directory with name link in
> > 8ddc4d5... file. Adde
Hi,
On Wed, 13 Jun 2007, Gerrit Pape wrote:
> $ mkdir repo && cd repo
> $ git init
> Initialized empty Git repository in .git/
> $ echo foo >file
> $ ln -s dangling link
> $ git add .
> $ git commit -mfoo
> Created initial commit c6a9189: foo
> 2 files changed, 2 insertions(+), 0 deleti
On Thu, Jun 07, 2007 at 11:52:19AM +0200, Remi Vanicat wrote:
> how to reproduce :
> create a repos with a link in it, then in a branch, remove the link,
> and add a directory in place of the link (same name).
>
> Then try to cherry pick a commit from a branch where there is the
> directory into a
4 matches
Mail list logo
