Attn: Hugh
I made a lot of changed to my local dev branch today for tomorrow's
removal of
macroSpec/@type
allowing <catchwords>, <secFol>, and <signatures> outside of <msDesc>
data.*.xml
There were problems that will probably break the build (more about
those later -- probably as soon as this is dealt with :-), so I
decided I should have used a different branch. So I issued:
$ git reset --keep HEAD~3
$ git checkout -t -b sydb-deprecationEnd_2018-10-01
$ git cherry-pick ..HEAD@{2}
It looks like it *mostly* worked:
$ git status -uno
| Your branch is ahead of 'dev' by 3 commits.
| (use "git push" to publish your local commits)
| nothing to commit (use -u to show untracked files)
But there are 2 problems:
1) A typo. That "HEAD~3" was supposed to be a "HEAD~5"
2) The 'dev' in that status output makes me worry that if I do a
`git push`, these changes would get pushed to dev, not the new
sydb-deprecationEnd_2018-10-01 branch.
I was smart enough to make a backup of my entire repository before
doing this, so I can go back and fix my 3/5 mistake easily. But I
thought the point of the -t switch was to set up tracking so that my
local sydb-deprecationEnd_2018-10-01 tracks a similarly named branch
on the remote (GitHub). Apparently not. What do I do to make that
work?
