<div dir="auto">If you want to skip the git pull, you can also do this:</div><div dir="auto"><br></div><div dir="auto">git fetch</div><div dir="auto">git reset --hard origin/master</div><div dir="auto"><br></div><div dir="auto">... assuming your origin is called "origin", which is the default, and that the branch in question is called "master." Note that this will set the current branch to whatever "master" is on origin, so use git checkout first if you're not on the right branch.</div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Nov 4, 2020 at 2:35 PM Dan Coutu <<a href="mailto:coutu@snowy-owl.com">coutu@snowy-owl.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Bruce, there’s more than one way to do it. Of course. <br>
<br>
If you have not done a git commit of your changes then you can use ‘git stash’ to save your changes in the stash.<br>
<br>
If you have made commits, and your commits are up to date, then skip doing things with the stash.<br>
<br>
If you want to have your changes available for later tinkering then make a branch at this point, checkout the branch, and apply your stash to it. So assuming you choose to name your branch mysandbox:<br>
<br>
git branch mysandbox<br>
git checkout my sandbox<br>
git stash apply<br>
<br>
Checkout master to get back to the main branch (assuming that it is called master):<br>
<br>
git checkout master<br>
<br>
You can then revert the files to the original clone of the repo like this:<br>
<br>
git reset —hard HEAD<br>
<br>
Then do a <br>
<br>
git pull<br>
<br>
To update your repo. That should get you where you want to be.<br>
<br>
I hope this helps!<br>
<br>
Dan<br>
<br>
> On Nov 4, 2020, at 1:43 PM, Bruce Labitt <<a href="mailto:bruce.labitt@myfairpoint.net" target="_blank">bruce.labitt@myfairpoint.net</a>> wrote:<br>
> <br>
> Guys & Gals, sorry for the elementary question.<br>
> <br>
> I have cloned a project that I am interested. Along the way, I fiddled <br>
> with setting, mostly debug, but none of my changes are important. I've <br>
> built the project and am using it. I'd like to re download it from the <br>
> repo again, abandoning any changes that I have made. A different person <br>
> has merged some changes and I want to try them.<br>
> <br>
> What is the best way to accomplish this? My head spins with all the <br>
> pushing and pulling. For some reason I am loath to nuke everything and <br>
> start over again. Is there a slightly more graceful way to do this in <br>
> git without nuking?<br>
> <br>
> github's man area is not illuminating, instead they talk about all sorts <br>
> of corner case things rather than something this basic.<br>
> <br>
> Thanks all.<br>
> <br>
> _______________________________________________<br>
> gnhlug-discuss mailing list<br>
> <a href="mailto:gnhlug-discuss@mail.gnhlug.org" target="_blank">gnhlug-discuss@mail.gnhlug.org</a><br>
> <a href="http://mail.gnhlug.org/mailman/listinfo/gnhlug-discuss/" rel="noreferrer" target="_blank">http://mail.gnhlug.org/mailman/listinfo/gnhlug-discuss/</a><br>
<br>
<br>
_______________________________________________<br>
gnhlug-discuss mailing list<br>
<a href="mailto:gnhlug-discuss@mail.gnhlug.org" target="_blank">gnhlug-discuss@mail.gnhlug.org</a><br>
<a href="http://mail.gnhlug.org/mailman/listinfo/gnhlug-discuss/" rel="noreferrer" target="_blank">http://mail.gnhlug.org/mailman/listinfo/gnhlug-discuss/</a><br>
</blockquote></div></div>-- <br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div>David Berube<br>Berube Consulting<br><a href="http://berubeconsulting.com" target="_blank">http://berubeconsulting.com</a><br>P.O Box 1746<br>Concord, NH 03302<br>United States<br>Tel: (603) 574-4766</div></div></div>