<div dir="ltr"><div class="gmail_default" style="font-size:small">Hi All,</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">A <b><i>git pull --rebase</i></b> on the VTK Master fails because of these deleted/untracked files. Does anyone know how to fix this?</div><div class="gmail_default" style="font-size:small">Of course I can do a <b><i>git checkout --</i></b> on the deleted file but that does not fix the issue. The deleted/untracked files reappear.</div><div class="gmail_default" style="font-size:small"> </div><div class="gmail_default" style="font-size:small">The only change I have made is to include VTK Large Data.</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">-------------------------------</div><div class="gmail_default"><div class="gmail_default">$ git status</div><div class="gmail_default">On branch master</div><div class="gmail_default">Your branch is up-to-date with 'origin/master'.</div><div class="gmail_default">Changes not staged for commit:</div><div class="gmail_default"> (use "git add/rm <file>..." to update what will be committed)</div><div class="gmail_default"> (use "git checkout -- <file>..." to discard changes in working directory)</div><div class="gmail_default"><br></div><div class="gmail_default"> deleted: Testing/Data/MFIXReader/.gitattributes</div><div class="gmail_default"> deleted: Testing/Data/NetCDF/.gitattributes</div><div class="gmail_default"> deleted: Testing/Data/WindBladeReader/.gitattributes</div><div class="gmail_default"><br></div><div class="gmail_default">Untracked files:</div><div class="gmail_default"> (use "git add <file>..." to include in what will be committed)</div><div class="gmail_default"><br></div><div class="gmail_default"> Testing/Data/MFIXReader/.gitattributes.md5</div><div class="gmail_default"> Testing/Data/NetCDF/.gitattributes.md5</div><div class="gmail_default"> Testing/Data/WindBladeReader/.gitattributes.md5</div><div class="gmail_default"><br></div><div class="gmail_default">no changes added to commit (use "git add" and/or "git commit -a")</div><div style="font-size:small"><div class="gmail_default">-------------------------------</div><div class="gmail_default"></div></div></div><div><br></div>-- <br><div class="gmail_signature">___________________________________________<br>Andrew J. P. Maclean<br><br>___________________________________________</div>
</div>