Cow "1" branch has commits that aren't in master - Githubissues

silverstripe / cow

Release tool for Silverstripe CMS

BSD 3-Clause "New" or "Revised" License

6 stars 8 forks source link

Cow "1" branch has commits that aren't in master #211

Closed GuySartorelli closed 1 year ago

GuySartorelli commented 2 years ago

There are a lot of commits in the 1 branch which aren't in the master branch: https://github.com/tractorcow/cow/compare/master...silverstripe:1

We don't use the 1 branch, so we should grab anything useful from that branch and then remove it.

Acceptance Criteria

[ ] All commits from the 1 branch which include bugfixes or useful functionality which is not in the master branch are cherry-picked into master
[ ] No regressions are introduced
[ ] The 1 branch is deleted

GuySartorelli commented 1 year ago

At this stage that's likely to cause more problems than it resolves.