Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jakartaee-tck-dev] schedule for rename of Platform TCK `tckrefactor` branch to `main`

Thanks Scott for taking care of the needed changes for making `main` the default branch!

I also renamed `master` to `notmaster` to avoid confusion between that branch versus `main`. 

On 7/21/24 12:10 AM, Scott Stark wrote:
We need to make the main branch the default, otherwise when you fork and don't unselect the 'only fork master' branch you have to tweak things on the command line.
Also, going to the https://github.com/jakartaee/platform-tck/ shows the now obsolete master branch instead of main.


On Sat, Jul 20, 2024 at 9:19 AM Scott Marlow via jakartaee-tck-dev <jakartaee-tck-dev@xxxxxxxxxxx> wrote:

Don't forget to locally do for your TCK clone(s):

"
git branch -m tckrefactor main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a

"
On 7/20/24 9:16 AM, Scott Marlow wrote:

Done!

I also updated the EL CI TCK job to use the `main` branch.

Next is figuring out how to make `main` default and rename `master` branch.

On 7/17/24 2:20 PM, Scott Marlow wrote:

As per the EE 11 Platform TCK project [1], we will rename the `tckrefactor` branch to `main` .

I will plan to rename the Platform TCK `tckrefactor` branch to `main` some time this coming weekend and will send email after.

As per [2], update your local clone of the Platform to use the `main` branch name instead of `tckrefactor`:

"Updating a local clone after a branch name changes

After you rename a branch in a repository on GitHub, any collaborator with a local clone of the repository will need to update the clone.

From the local clone of the repository on a computer, run the following commands to update the name of the default branch.

git branch -m OLD-BRANCH-NAME NEW-BRANCH-NAME
git fetch origin
git branch -u origin/NEW-BRANCH-NAME NEW-BRANCH-NAME
git remote set-head origin -a

Optionally, run the following command to remove tracking references to the old branch name.

git remote prune origin
"

So, locally, I will do the following in my local Platform TCK clone:

"
git branch -m tckrefactor main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
"

Scott

[1] https://github.com/orgs/jakartaee/projects/12/views/1

[2] https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch

_______________________________________________
jakartaee-tck-dev mailing list
jakartaee-tck-dev@xxxxxxxxxxx
To unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/jakartaee-tck-dev

Back to the top