*makes chain saw noises* (trimming branches, get it?)
Thanks Joan! Best Jan — > On 21. Oct 2020, at 20:23, Joan Touzet <woh...@apache.org> wrote: > > I am starting the work now. As there was no response, I'm going to only > keep these branches: > > 2.3.x > 3.x > main > master (with a README saying you're in the wrong place) > > plus these PR branches: > > bump-ibrowse (#3208) > smoosh-update-operator-guide (#3184) > re-enable-most-elixir-tests (#3175) > feat/add-same-site-secure/master (#3131) > feat/access-master-clean (#3038) > prototype/fdb-layer-db-version-as-vstamps (#2952) > feat/access-3.x (#2943) > ioq-per-shard-or-user (#1998) > 1278-add-clustered-db-info (#1443) > record_last_compaction (#1272) > > Any of the above that were targeted to prototype/fdb-layer or master > have been re-targeted to main (except a couple clustering-specific ones > which were set to 3.x). Please check if this is correct for your PRs. > > -Joan "clean all the things?" Touzet > > On 14/10/2020 13:19, Joan Touzet wrote: >> A reminder about this: I intend to start this work tomorrow. If you have >> any PRs or branches you want left alone, speak now. >> >> Based on feedback I've received, it sounds like the prototype/fdb-* >> branches are now done? If this is **NOT** the case, speak up. >> >> -Joan >> >> On 07/10/2020 18:10, Joan Touzet wrote: >>> Hi there, >>> >>> I'd like to clean up our branches in git on the main couchdb repo. This >>> would involve deleting some of our obsolete branches, after tagging the >>> final revision on each branch. This way, we retain the history but the >>> branch no longer appears in the dropdown on GitHub, or in git branch >>> listings at the cli. >>> >>> Example process: >>> >>> git tag archive/1.3.x 1.3.x >>> git branch -d 1.3.x >>> git push origin :1.3.x >>> git push --tags >>> >>> If we ever needed the branch back, we just: >>> >>> git checkout -b 1.3.x archive/1.3.x >>> >>> I would propose to do this for all branches except: >>> >>> main >>> master (for now) >>> 2.3.x >>> 3.x >>> prototype/fdb-layer >>> >>> ...plus any branches that have been touched in the past 90 days, that >>> still have open PRs, or that someone specifically asks me to retain in >>> this thread. >>> >>> I'd also like to do this on couchdb-documentation and couchdb-fauxton. >>> >>> I would propose to do this about 1 week from now, let's say on October >>> 15th. >>> >>> Thoughts? >>> >>> -Joan "fall cleaning" Touzet
