[vtk-developers] VTK Master git pull --rebase issue.

[Paul Dao]

If the relevant changes are stored in commits, then:

*git reset --hard*
*git clean -dfx*
*git pull upstream master*

THIS WILL DELETE ALL UNCOMMITTED CHANGES!!!

2017-09-27 17:04 GMT-05:00 Andrew Maclean <andrew.amaclean at gmail.com>:

> Hi All,
>
> A  *git pull --rebase* on the VTK Master fails because of these
> deleted/untracked files. Does anyone know how to fix this?
> Of course I can do a *git checkout --* on the deleted file but that does
> not fix the issue. The deleted/untracked files reappear.
>
> The only change I have made is to include VTK Large Data.
>
> -------------------------------
> $ git status
> On branch master
> Your branch is up-to-date with 'origin/master'.
> Changes not staged for commit:
>   (use "git add/rm <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>         deleted:    Testing/Data/MFIXReader/.gitattributes
>         deleted:    Testing/Data/NetCDF/.gitattributes
>         deleted:    Testing/Data/WindBladeReader/.gitattributes
>
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
>
>         Testing/Data/MFIXReader/.gitattributes.md5
>         Testing/Data/NetCDF/.gitattributes.md5
>         Testing/Data/WindBladeReader/.gitattributes.md5
>
> no changes added to commit (use "git add" and/or "git commit -a")
> -------------------------------
>
> --
> ___________________________________________
> Andrew J. P. Maclean
>
> ___________________________________________
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/
> opensource/opensource.html
>
> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/mailman/listinfo/vtk-developers
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20170927/559f7e04/attachment.html>