search

thecommons-urbit / chess

Distribution repo for Urbit Chess app
Other
26 stars 8 forks source link

Update `develop` branch to match `master` #108

Closed ashelkovnykov closed 1 year ago

ashelkovnykov commented 1 year ago

This is a one-time thing that needs to be done to make develop the primary development branch.

brbenji commented 1 year ago

is there more to this PR than the 4 commits? I'm not clear on how this is a one time thing.

ashelkovnykov commented 1 year ago

@brbenji The normal workflow should be:

  1. Developers PR completed work on top of develop
  2. New version releases git cherry-pick commits from develop to apply to master in a PR

Therefore, committing from master to develop never happens, since develop is always either ahead of master (in some way; it has some commit master doesn't) or identical to master.

However, in this PR, I'm attempting to merge from master to develop, because we haven't instituted this workflow yet. This should be the only time we ever need to move commits from master to develop, instead of the other way around.

rovmug-ticfyn commented 1 year ago

LGTM