Re: [Emc-users] git requests

2017-08-23 Thread Przemek Klosowski
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 cre

Re: [Emc-users] git requests

2017-08-23 Thread Gene Heskett
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

Re: [Emc-users] git requests

2017-08-23 Thread Chris Albertson
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. On Wed, Aug 23, 2017 at 5:39 PM, Gene Heskett wrote: > If I an cd'd to a linuxcnx-git directory already containing a clone of > the 2.8.0-pre

Re: [Emc-users] git requests

2017-08-23 Thread Kurt Jacobson
Maybe try: git pull origin master Kurt Jacobson 505-303-1933 Sent from Mobile On Aug 23, 2017 8:40 PM, "Gene Heskett" 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?