On Wednesday 02 September 2020 06:13:17 andy pugh wrote: > On Wed, 2 Sep 2020 at 09:51, Gene Heskett <[email protected]> wrote: > > But, now I am locked out of a git pull, and apparently need to git > > commit. How do I get back to active status? > > git reset --hard origin master > > (or maybe origin/master, I tend to forget) > > Or, you could > git checkout debian/configure > Which will pull back the original of the file.
Which got the patched file (including the ,cn) & everything looks ok. Thanks Andy. Cheers, Gene Heskett -- "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis Genes Web page <http://geneslinuxbox.net:6309/gene> _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
