OK, so I did that
Code:
plasma@plasma ~/linuxcnc-dev $ git checkout dgarr/external_offsets
M bin/.gitignore
Branch dgarr/external_offsets set up to track remote branch dgarr/external_offsets from origin.
Switched to a new branch 'dgarr/external_offsets'
And then I thought the next step would be a git pull which failed
Code:
plasma@plasma ~/linuxcnc-dev $ git pull
remote: Counting objects: 179, done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 29 (delta 28), reused 0 (delta 0)
Unpacking objects: 100% (29/29), done.
From git://git.linuxcnc.org/git/linuxcnc
+ c786d2d...3166ec6 dgarr/external_offsets -> origin/dgarr/external_offsets (forced update)
Auto-merging src/emc/task/emctaskmain.cc
Auto-merging src/emc/rs274ngc/gcodemodule.cc
Auto-merging src/emc/motion/control.c
CONFLICT (content): Merge conflict in src/emc/motion/control.c
Auto-merging docs/src/motion/external-offsets.txt
CONFLICT (add/add): Merge conflict in docs/src/motion/external-offsets.txt
Automatic merge failed; fix conflicts and then commit the result.
So how do I get the branch source?
