You probably made changes to the files, so git pull realizes that it'd overwrite your changes and refuses to run. If you don't care about your changes, just abandon them git reset --hard origin/master git pull origin master If you do care about your changes, you have to stash them away: perhaps create a branch and merge it back when you update from remote master.
On Wed, Aug 23, 2017 at 10:24 PM, Gene Heskett <ghesk...@shentel.net> wrote: > On Wednesday 23 August 2017 21:28:21 Chris Albertson wrote: > > > See "man git-pull" > > > > The man page has the dash but when you type the command , no dash. > > "git pull" merge upstream changes with any you have made locally. > > > IPt refuses to do it, apparently in exploring git gui, I've contaminated > the clone checkout so its not virgin anymore. > > > On Wed, Aug 23, 2017 at 5:39 PM, Gene Heskett <ghesk...@shentel.net> > wrote: > > > If I an cd'd to a linuxcnx-git directory already containing a clone > > > of the 2.8.0-pre source tree, what is the proper command to update > > > it to the current 2.8.0-pre? I do not see an update command in a > > > "man git". > > > > > > Thanks. > > > > > > 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) > > > Genes Web page <http://geneslinuxbox.net:6309/gene> > > > > > > ------------------------------------------------------------ > > > ------------------ > > > Check out the vibrant tech community on one of the world's most > > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > > _______________________________________________ > > > Emc-users mailing list > > > Emc-users@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/emc-users > > > 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) > Genes Web page <http://geneslinuxbox.net:6309/gene> > > ------------------------------------------------------------ > ------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > Emc-users mailing list > Emc-users@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-users > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Emc-users mailing list Emc-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-users
