On 04/20/2017 12:31 PM, Stuart Stevenson wrote: > I get this message when running 'git pull' in my 2.7 directory. > > this doesn't make sense to me so what is it saying? > > enshu@enshu:~/linuxcnc2.7-dev/src$ git status > # On branch 2.7-ilowpass-fix > # Your branch is ahead of 'origin/2.7-ilowpass-fix' by 7 commits. > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # ../configs/by_machine/enshu_touchy/ > # ../debian/linuxcnc-uspace-rtai.files > # ../debian/linuxcnc-uspace-xenomai.files > # ../docs/man/man1/thermistor.1 > # ../lib/python/pyui/ > # ../scripts/halcmd_twopass > # config.h.in~ > # emc/usr_intf/touchy/touchy_new.py > # emc/usr_intf/touchy/touchy_orig.py > # hal/components/enshutoolchange.comp > # hal/components/estop_latch2.comp > # hal/components/gear2.comp > nothing added to commit but untracked files present (use "git add" to track)
"git pull" means "fetch all the new stuff from the remote server and merge it into whatever i have in my working tree", and that's probably not what you want in this situation since you're on a short-lived bugfix branch (2.7-ilowpass-fix). Try this instead: git checkout 2.7 git fetch git merge --ff-only origin/2.7 The "merge --ff-only" means: if my local 2.7 is in the history of origin's 2.7 (ie, if i've made no local commits), then move my 2.7 ahead to catch up to origin's 2.7, but if i've made local commits then stop and don't change anything. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
