+1 for renaming them to develop and release. > Maybe we can create / rename it during the next release so we can test the > suggestion of Chris.
+1 Best, Zike Yang On Fri, Nov 4, 2022 at 3:26 PM Christofer Dutz <[email protected]> wrote: > > Hi all, > > Usually there’s an .asf.yaml that handles which branches are protected etc. > But I remember, that for changes like this, better open an Infra ticket. > > Chris > > From: Florian Micklich <[email protected]> > Date: Friday, 4. November 2022 at 08:14 > To: [email protected] <[email protected]> > Subject: Re: [DISCUSS] What is the Master branch currently used for? > Hi, > > I also think that develop and release are perfect as branch names. > > Does it have any impact on a CI build that needs to be adjusted? > I come from mainly from the gitlab world and have no clue about github > actions. > > Greetings > Florian > > > Am Donnerstag, dem 03.11.2022 um 20:54 +0000 schrieb Philipp Zehnder: > > Hi,<br> > > > > I am also in favor of renaming the branches.<br> > > > > @Tim, the master branch is only used for the releases. So, I guess > > "release" is a good name for it. Maybe we can create / rename it during the > > next release so we can test the suggestion of Chris.<br> > > > > Cheers,<br> > > Philipp<br> > > > > ________________________________<br> > > Von: Dominik Riemer <[[email protected]](mailto:[email protected])><br> > > Gesendet: Donnerstag, November 3, 2022 9:48 PM<br> > > An: [[email protected]](mailto:[email protected]) > > <[[email protected]](mailto:[email protected])><br> > > Betreff: RE: [DISCUSS] What is the Master branch currently used for?<br> > > > > As our release guide has almost as many different instructions for avoiding > > merge conflicts as the number of releases we've had, doing a force push > > should be definitely worth a try for the next release 😉<br> > > > > [https://cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps](https://cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps<https://cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps%5d(https:/cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps>) > > 😃<br> > > > > > > > > > > -----Original Message-----<br> > > From: Christofer Dutz > > <[[email protected]](mailto:[email protected])><br> > > Sent: Thursday, November 3, 2022 9:27 PM<br> > > To: [[email protected]](mailto:[email protected])<br> > > Subject: Re: [DISCUSS] What is the Master branch currently used for?<br> > > > > Shouldn’t a force push to main/master/release help with that?<br> > > That’s what we do in PLC4X.<br> > > > > Chris<br> > > > > > > From: Tim <[[email protected]](mailto:[email protected])><br> > > Date: Thursday, 3. November 2022 at 21:15<br> > > To: [[email protected]](mailto:[email protected]) > > <[[email protected]](mailto:[email protected])><br> > > Subject: Re: [DISCUSS] What is the Master branch currently used for?<br> > > We could also try to not only rename our master branch, but create a new > > branch based on master. In order to then get rid of our lengthy merge > > conflicts we have with each relase.<br> > > What do you think about this? Are there any downsides of this that aren't > > on my radar now?<br> > > > > Best<br> > > Tim<br> > > > > Am 03.11.2022 21:12 schrieb Tim:<br> > > > I'm also in favour of this renaming.<br> > > > > > > Best<br> > > > Tim<br> > > > > > > Am 03.11.2022 21:01 schrieb Dominik Riemer:<br>> > > > > Hi,<br> > > > > > > > > yes, our master branch currently points to the latest release > > > > version.<br> > > > > I like the idea to rename "master" to "release" and "dev" to<br> > > > > "develop", what do you think?<br> > > > > > > > > Cheers<br> > > > > Dominik<br> > > > > > > > > On 2022/11/03 14:39:54 Christofer Dutz wrote:<br>> > > > > > > Hi,<br> > > > > > > > > > > good point … also it tends to upset some people. Most projects<br> > > > > > settled on “main” instead of “master”.<br> > > > > > In the PLC4X project however we decided to call the development<br> > > > > > branch “develop” and the banch where we merge releases “release”.<br> > > > > > This way the branches sort of explain what they are themselves ;-)<br> > > > > > > > > > > Chris<br> > > > > > > > > > > > > > > > From: Zike Yang <[[email protected]](mailto:[email protected])><br> > > > > > Date: Thursday, 3. November 2022 at 15:29<br> > > > > > To: [[email protected]](mailto:[email protected]) > > > > > <[[email protected]](mailto:[email protected])><br> > > > > > Subject: [DISCUSS] What is the Master branch currently used for?<br> > > > > > Hi all,<br> > > > > > > > > > > We use the `dev` branch as the default branch. But there still<br> > > > > > exists the master branch.[0] And it was still updated 21 days ago.<br> > > > > > I'm curious about what the master branch is currently used for.<br> > > > > > > > > > > I think it's better to rename the master branch to another name if<br> > > > > > it has other usage because it will confuse developers if there is<br> > > > > > already a default branch. Sometimes I would accidentally checkout > > > > > to<br> > > > > > master and then realize something was wrong.<br> > > > > > > > > > > What's your thought?<br> > > > > > > > > > > [0] > > > > > [https://github.com/apache/incubator-streampipes/tree/master](https://github.com/apache/incubator-streampipes/tree/master)<br<https://github.com/apache/incubator-streampipes/tree/master%5d(https:/github.com/apache/incubator-streampipes/tree/master)%3cbr>> > > > > > > > > > > Best,<br> > > > > > Zike Yang<br> > > > > >
