<div dir="ltr"><div class="gmail_default" style="font-size:small">I did:</div><div class="gmail_default" style="font-size:small"><div style="font-size:12.8px">git fetch origin master</div><div style="font-size:12.8px">git reset --hard FETCH_HEAD</div><div class="gmail-yj6qo gmail-ajU" style="font-size:12.8px"></div></div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">and everything looked Ok.</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Then I removed the untracked files:</div><div class="gmail_default"><div class="gmail_default" style="font-size:small"> Testing/Data/MFIXReader/.gitattributes.md5</div><div class="gmail_default" style="font-size:small"> Testing/Data/NetCDF/.gitattributes.md5</div><div class="gmail_default" style="font-size:small"> Testing/Data/WindBladeReader/.gitattributes.md5</div><div style="font-size:small"><br></div><div style="font-size:small">Then did <b><i>ninja-t clean, </i></b>re-ran CMake, and I am back to the same problem:</div><div style="font-size:small">---------</div><div><div>$ git status</div><div>On branch master</div><div>Your branch is up-to-date with 'origin/master'.</div><div>Changes not staged for commit:</div><div> (use "git add/rm <file>..." to update what will be committed)</div><div> (use "git checkout -- <file>..." to discard changes in working directory)</div><div><br></div><div> deleted: Testing/Data/MFIXReader/.gitattributes</div><div> deleted: Testing/Data/NetCDF/.gitattributes</div><div> deleted: Testing/Data/WindBladeReader/.gitattributes</div><div><br></div><div>Untracked files:</div><div> (use "git add <file>..." to include in what will be committed)</div><div><br></div><div> Testing/Data/MFIXReader/.gitattributes.md5</div><div> Testing/Data/NetCDF/.gitattributes.md5</div><div> Testing/Data/WindBladeReader/.gitattributes.md5</div><div><br></div><div>no changes added to commit (use "git add" and/or "git commit -a")</div></div><div style="font-size:small"><br></div><div style="font-size:small">---------</div><div style="font-size:small">So I think there is an issue with these three md files.</div><div style="font-size:small"><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 28, 2017 at 8:15 AM, David Gobbi <span dir="ltr"><<a href="mailto:david.gobbi@gmail.com" target="_blank">david.gobbi@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I often have extra files in my working directory (messy, I know) so to avoid erasing them, I explicitly fetch whatever I know my upstream to be, and then I reset my head and working directory to the fetch_head:<div><br></div><div>git fetch origin master</div><div>git reset --hard FETCH_HEAD</div><div><div class="h5"><div><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 27, 2017 at 4:08 PM, Paul Dao <span dir="ltr"><<a href="mailto:xoviat@gmail.com" target="_blank">xoviat@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">If the relevant changes are stored in commits, then:<div><br></div><div><b>git reset --hard</b></div><div><b>git clean -dfx</b></div><div><b>git pull upstream master</b></div><div><br></div><div>THIS WILL DELETE ALL UNCOMMITTED CHANGES!!!<br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="m_-9040664938897506218m_-6778416609723247129h5">2017-09-27 17:04 GMT-05:00 Andrew Maclean <span dir="ltr"><<a href="mailto:andrew.amaclean@gmail.com" target="_blank">andrew.amaclean@gmail.com</a>></span>:<br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="m_-9040664938897506218m_-6778416609723247129h5"><div dir="ltr"><div style="font-size:small">Hi All,</div><div style="font-size:small"><br></div><div 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 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 style="font-size:small"> </div><div style="font-size:small">The only change I have made is to include VTK Large Data.</div><div style="font-size:small"><br></div><div style="font-size:small">------------------------------<wbr>-</div><div><div>$ git status</div><div>On branch master</div><div>Your branch is up-to-date with 'origin/master'.</div><div>Changes not staged for commit:</div><div> (use "git add/rm <file>..." to update what will be committed)</div><div> (use "git checkout -- <file>..." to discard changes in working directory)</div><div><br></div><div> deleted: Testing/Data/MFIXReader/.gitat<wbr>tributes</div><div> deleted: Testing/Data/NetCDF/.gitattrib<wbr>utes</div><div> deleted: Testing/Data/WindBladeReader/.<wbr>gitattributes</div><div><br></div><div>Untracked files:</div><div> (use "git add <file>..." to include in what will be committed)</div><div><br></div><div> Testing/Data/MFIXReader/.gitat<wbr>tributes.md5</div><div> Testing/Data/NetCDF/.gitattrib<wbr>utes.md5</div><div> Testing/Data/WindBladeReader/.<wbr>gitattributes.md5</div><div><br></div><div>no changes added to commit (use "git add" and/or "git commit -a")</div><div style="font-size:small"><div>------------------------------<wbr>-</div><span class="m_-9040664938897506218m_-6778416609723247129m_3038524280434065219HOEnZb"><font color="#888888"><div></div></font></span></div></div><span class="m_-9040664938897506218m_-6778416609723247129m_3038524280434065219HOEnZb"><font color="#888888"><div><br></div>-- <br><div class="m_-9040664938897506218m_-6778416609723247129m_3038524280434065219m_-5235112319164515600gmail_signature">______________________________<wbr>_____________<br>Andrew J. P. Maclean<br><br>______________________________<wbr>_____________</div>
</font></span></div>
</div></div></blockquote></div></div></div></div></blockquote></div><br></div></div></div></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">___________________________________________<br>Andrew J. P. Maclean<br><br>___________________________________________</div>
</div>