From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 27 Oct 2008 14:38:46 GMT
Subject: Re: rebase, file permissions and removed file
Message-ID: <4905D276.9020308@viscovery.net>
In-Reply-To: <a2633edd0810270702x416bb659ke183b0cc6266071@mail.gmail.com>

Pascal Obry schrieb:
> # At this point there is a conflict as expected
> # file1 has been removed on master, and file1 had its permissions changed
> # on fixperms branch.
> #
> # What I find confusing is that:
> #    $ git diff
> # and
> #    $ git diff --cached
> #
> # are reporting nothing.
> #
> # Ok, file1 has been removed, let's then remove it as it is right:
> #
> #   $ git rm file1
> #   fatal: pathspec 'file1' did not match any files
> #
> # Ok, so what's the proper way to fix that! What should I do to be able to
> # continue the rebase:

Since you don't have any content to lose, you can always just

 $ touch file1
 $ git add file1
 $ git rm file1

-- Hannes