On 8/28/20 2:42 PM, Clément Robert via yt-dev wrote:
Hi Cameron, So I agree the branch is basically useless now, /but /I do see a reason to keep it around for now: There may be active PRs that are still targeting this branch (though Madicken did a great job at reaiming them to master)
GitHub would detect that and yell at you if you'd tried to close a branch that has PR against it. Note, closing it manually via git would result in those hypothetical PRs closing too, which I'd argue is a good thing.
worse: people could have local development branches based of this one that they intend to open a PR.
Removing a branch from upstream repo doesn't affect local clone at all. You'd need to run "git remote prune origin" to notice it. Secondly, we wouldn't allow those merges to happen, so removing the branch makes even more sense.
The migration path is pretty clear in both cases: those branches should just be rebased onto master. However, not every contributor is very confortable with git in general so I don’t think it’s a good idea to make the path any more confusing to them.
Ultimately we *will* ask them to rebase. There's no going around that.
Instead of deleting the branch, we might just want to protect it to prevent someone accidentally push to it. I may be overly cautious, I don’t know. In any case, this the only reason I can see against deletion.
This branch has 0 commits ahead of master. At this point it's just a named commit and nothing else. It can be recreated after removal if someone really misses it by:
git checkout 37052e657 -b yt-4.0 git push origin yt-4.0
On 28 Aug 2020, at 20:34, Matthew Turk <email@example.com mailto:firstname.lastname@example.org> wrote:
I don't see a reason to keep it around, but I'm also not sure I understand the subtleties that we may run into if we remove it.
On Fri, Aug 28, 2020 at 1:32 PM Cameron Hummels <email@example.com mailto:firstname.lastname@example.org> wrote:
Hey devs, Congratulations to the team on merging yt-4.0 into the main dev branch of the repo a couple months ago! I noticed that the yt-4.0 branch is still hanging around the main yt repo. Unless there is a good reason that it's sticking around, I propose we delete it so as to not confuse users who might checkout that branch, when it's no longer being updated since it was merged with the master branch. I'm happy to do this, but I didn't want to take unilateral action if there was a good reason others were keeping it on, and due to the way github works, I don't think there is a way to PR a branch deletion. One just has to do it from the web interface (or push a local change). Is there any reason to keep the yt-4.0 branch around now that it's merged with the master branch? If not, I'll delete it in the next few days. Thanks, everyone! Cameron -- Cameron Hummels Computational Astrophysicist California Institute of Technology http://chummels.org <http://chummels.org/> _______________________________________________ yt-dev mailing list -- email@example.com <mailto:firstname.lastname@example.org> To unsubscribe send an email to email@example.com <mailto:firstname.lastname@example.org> https://mail.python.org/mailman3/lists/yt-dev.python.org/ Member address: email@example.com <mailto:firstname.lastname@example.org>
yt-dev mailing list -- email@example.com To unsubscribe send an email to firstname.lastname@example.org https://mail.python.org/mailman3/lists/yt-dev.python.org/ Member address: email@example.com