untracked file after fastforward

[waleo]

Hello,

After my last merge from upstream/master this file is showing up as untracked

"drcongo_data/originals/OMS_Rapport de Situation 01_Cas de gastro-ent\303\251rite h\303\251morragique et f\303\251brile.pdf"

After removing it locally, git thinks it needs to be git removed, which is weird. git ls-files shows it has been removed.

[tallenaz]

I'm not sure if you want to recover the untracked file, or remove it from the working tree, but here are the methods to do each:

If you want to recover the untracked file:

git add .

Then, the file will be staged, and you can commit and push it.

If you want to clean it out of the working tree:

git clean -n
git clean -f
git add -A
git commit -m 'Add comment'

Then, you can push that change out. The -n flag performs a test run, and the -f flag does the real thing.

[cmrivers]

Sorry is this something I need to do, or @waleo?

[tallenaz]

Anyone who checks the repository out can do it. I'm happy to submit a pull request if you like :) In that case, just let me know if you want the file added, or cleaned out.

[tallenaz]

I took the liberty of forking the repo, and I have a couple of branches: one that re-adds the untracked file, and another that cleans it out of the master branch. Here's the relevant commit from the re-adding branch:

tallenaz@350d50d

and the same from the cleanup branch:

tallenaz@0e1380b

Let me know which commit you'd like pulled, if either, and I'll issue a pull request for that branch. Cheers. :)

[cmrivers]

That's great, thanks! The cleanup branch please. :-)
On Nov 22, 2014 10:07 PM, "Anthony Zanella" notifications@github.com
wrote:

I took the liberty of forking the repo, and I have a couple of branches:
one that re-adds the untracked file, and another that cleans it out of the
master branch. Here's the relevant commit from the re-adding branch:

tallenaz/ebola@350d50d
tallenaz@350d50d

and the same from the cleanup branch:

tallenaz/ebola@0e1380b
tallenaz@0e1380b

Let me know which commit you'd like pulled, and I'll issue a pull request
for that branch. Cheers. :)

—
Reply to this email directly or view it on GitHub
https://github.com/cmrivers/ebola/issues/94#issuecomment-64104824.[image:
Web Bug from
https://github.com/notifications/beacon/ABPe9toxi6ItnpSbbunaS6vu_1Jnrksoks5nQUbXgaJpZM4C4k7P.gif]