Am 2013-01-25 19:07, schrieb Junio C Hamano:
Carsten Fuchs writes:
[...]
$ git merge origin/master --ff-only
Updating f419d57..2da6052
error: The following untracked working tree files would be overwritten by merge:
obsolete/e107/Readme.txt
obsolete/e107/article.php
Carsten Fuchs writes:
> Hi all,
>
> in my repo, I'm doing this:
>
>> $ git status
>> # On branch master
>> # Your branch is behind 'origin/master' by 2 commits, and can be
>> fast-forwarded.
>> #
>> # Untracked files:
>> # (use "git add ..." to include in what will be committed)
>> #
>> #
Hi all,
in my repo, I'm doing this:
> $ git status
> # On branch master
> # Your branch is behind 'origin/master' by 2 commits, and can be
fast-forwarded.
> #
> # Untracked files:
> # (use "git add ..." to include in what will be committed)
> #
> # obsolete/
> nothing added to commit bu
3 matches
Mail list logo