OK, I just deleted the remote branch flume-1.7 using the following command:
git push origin --delete flume-1.7 I did take a local backup of that branch before I did it. Let me know if you think I should restore its existence at this time for any reason. Mike PS: I also deleted the "master" branch, which was never used by the Apache Flume project and had some accidental garbage in it from several years ago. On Wed, Jul 13, 2016 at 1:23 PM, Lior Zeno <[email protected]> wrote: > Many projects follow this branching model: > http://nvie.com/posts/a-successful-git-branching-model/ > In my experience, it is working pretty well. > On Jul 13, 2016 23:20, "Hari Shreedharan" <[email protected]> wrote: > > > +1. Let's get rid of the 2 branch policy. I think we can now technically > > force-push to all branches, but we should probably still avoid it. Please > > go ahead and sync 1.7 with trunk. > > > > On Wed, Jul 13, 2016 at 1:11 PM Mike Percy <[email protected]> wrote: > > > > > On Wed, Jul 13, 2016 at 1:08 PM, Mike Percy <[email protected]> wrote: > > > > > > > > PS: In the meantime, I will cherry-pick all of my recent commits to > the > > > > flume-1.7 branch. I just don't think we should create a flume-1.8 > > branch > > > > once we release Flume 1.7.0 > > > > > > > > > > Actually, my preference would be to force-push the flume-1.7 branch so > > that > > > it exactly matches trunk. IIRC, the only branch we cannot force-push is > > > trunk, unless that ASF git configuration has changed recently. > > > > > > Mike > > > > > >
