DOI-USGS / usgscsm

This repository stores USGS Community Sensor Model (CSM) camera models
Other
26 stars 33 forks source link

Change dev branch to main #430

Closed jessemapel closed 8 months ago

jessemapel commented 1 year ago

USGSCSM uses dev for the name of its default branch as a hold over from when we used it in ISIS. For consistency we would like to change the default branch on this repo to main so that it is similar to other newly created repos.

This will be a small disruption for contributors in two main ways:

First, all open PRs will need to be changed to go into main instead of dev. The maintainers can make this change on open PRs and it shouldn't result in any merge conflicts because the new main branch will be exactly the same as dev.

Second, contributors will need to use slightly different git commands when pulling or creating new branches. To create a new branch contributors will run git fetch upstream && git checkout -b my_work_branch upstream/main instead of git fetch upstream && git checkout -b my_work_branch upstream/dev. If the dev branch still exists, then the old command will still execute without error, but the new branch my_work_branch will be missing any new commits since the switch over. So, we should delete the old dev branch when we do this so that the old command errors instead of silently continuing with problems.

jessemapel commented 1 year ago

Other public repos that we would like to move to main instead of master:

https://github.com/USGS-Astrogeology/ale/issues/505

https://github.com/USGS-Astrogeology/plio/issues/183

https://github.com/USGS-Astrogeology/knoten/issues/106

https://github.com/USGS-Astrogeology/swigcsm/issues/35

jessemapel commented 1 year ago

We would like to also move ISIS over to main

https://github.com/USGS-Astrogeology/ISIS3/issues/5068