A different branch but here is what Dewey gave me
Code:
1) if building from source:
a) $ git fetch
b) $ git reset --hard origin/dgarr/external_offsets
c) $ cd the_src_dir; make && sudo make setuid
where the_src_dir usually will be linuxcnc_dev
This will replace your version of master with the branch. You can follow the same instructions to go back to master.
There is a way to merge and rebase branches but you can get into trouble quickly. I did it once and then had to delete everything and start again. Google "Git merge" and "git rebase" and see what you find. There should be a source editor that allows you to view 2 files side by side and accept or reject changes. Maybe someone can chip in. I suspect that it would be best to do the edits by hand rather than just blindly adopt it but someone more experienced might chip in.