Not sure how the stage-vote-release-plugin works internally, but I think
the branch is not set in calcite and calcite-avatica originally, so
perhaps it's smart enough to use the name of the current branch instead
of defaulting to master.
On 27/04/2022 9:03 am, Michael Mior wrote:
One outstanding issue is that I was unable to set the branch to main for
stage-vote-release-plugin. I believe it may default to "master", so I'm not
sure if we'll run into issues on the next release.
--
Michael Mior
mm...@apache.org
Le mar. 26 avr. 2022 à 16:30, Julian Hyde <jh...@apache.org> a écrit :
Thanks, Michael. It all looks good from my end.
I had opened a pull request yesterday (when the branch was named
'master') and it merged smoothly today (after the rename).
Julian
On Tue, Apr 26, 2022 at 7:54 AM Michael Mior <mm...@apache.org> wrote:
The master branch has now been renamed to main. If you have an existing
checkout, please follow the steps below (thanks to Francis!) to ensure
your
local master branch is also correctly renamed. Note that if you do not
have
any local changes, you can also simply clone a new copy of the repository
and the default branch will now be main.
1. Ensure you are in the repository's folder in your command line.
2. Stash any uncommitted changes:
- git stash
3. Check out your local master branch:
- git checkout master
4. Rename your local master branch to main:
- git branch -m master main
5. Fetch latest commits and branches from remote:
- git fetch
6. Remove the tracking branch:
- git branch --unset-upstream
7. Create a new tracking branch (assuming the remote is called
origin):
- git branch -u origin/main
8. Restore your uncommitted changes:
- git stash pop
--
Michael Mior
mm...@apache.org
