Christopher,
Thanks for cleaning up my mess, I appreciate your help here. Your git-foo
is stronger than mine :-) Lesson learned regarding the GitHub UI merge
between major branches. The GH UI in this case is lacking several important
features - 1) a warning, 2) it didn't show in the UI all of th
Oh, in case you updated your local 2.1 branch after main was merged
onto it, but before I force-pushed to fix it, just reset your 2.1
branch by checking out your local 2.1 branch, doing `git remote
update` and then `git reset --hard upstream/2.1` before you do
anything else. That way, we don't get
Hi Accumulo devs,
I just wanted to give you a heads up about branch maintenance for the
2.1 branch. A few mistakes were made, and the main branch accidentally
got merged backwards into the 2.1 maintenance branch instead of the
other way around. In order to fix this and not have the history
complet
