You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@streampipes.apache.org by Zike Yang <zi...@apache.org> on 2022/11/03 14:29:03 UTC
[DISCUSS] What is the Master branch currently used for?
Hi all,
We use the `dev` branch as the default branch. But there still exists
the master branch.[0] And it was still updated 21 days ago. I'm
curious about what the master branch is currently used for.
I think it's better to rename the master branch to another name if it
has other usage because it will confuse developers if there is already
a default branch. Sometimes I would accidentally checkout to master
and then realize something was wrong.
What's your thought?
[0] https://github.com/apache/incubator-streampipes/tree/master
Best,
Zike Yang
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Zike Yang <zi...@apache.org>.
+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
<ch...@c-ware.de> 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 <mi...@apache.org>
> Date: Friday, 4. November 2022 at 08:14
> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
> 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 <[riemer@fzi.de](mailto:riemer@fzi.de)><br>
> > Gesendet: Donnerstag, November 3, 2022 9:48 PM<br>
> > An: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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 <[christofer.dutz@c-ware.de](mailto:christofer.dutz@c-ware.de)><br>
> > Sent: Thursday, November 3, 2022 9:27 PM<br>
> > To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)<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 <[bossenti@posteo.de](mailto:bossenti@posteo.de)><br>
> > Date: Thursday, 3. November 2022 at 21:15<br>
> > To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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 <[zike@apache.org](mailto:zike@apache.org)><br>
> > > > > Date: Thursday, 3. November 2022 at 15:29<br>
> > > > > To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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>
> > > > >
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Christofer Dutz <ch...@c-ware.de>.
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 <mi...@apache.org>
Date: Friday, 4. November 2022 at 08:14
To: dev@streampipes.apache.org <de...@streampipes.apache.org>
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 <[riemer@fzi.de](mailto:riemer@fzi.de)><br>
> Gesendet: Donnerstag, November 3, 2022 9:48 PM<br>
> An: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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 <[christofer.dutz@c-ware.de](mailto:christofer.dutz@c-ware.de)><br>
> Sent: Thursday, November 3, 2022 9:27 PM<br>
> To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)<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 <[bossenti@posteo.de](mailto:bossenti@posteo.de)><br>
> Date: Thursday, 3. November 2022 at 21:15<br>
> To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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 <[zike@apache.org](mailto:zike@apache.org)><br>
> > > > Date: Thursday, 3. November 2022 at 15:29<br>
> > > > To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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>
> > > >
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Florian Micklich <mi...@apache.org>.
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 <[riemer@fzi.de](mailto:riemer@fzi.de)><br>
> Gesendet: Donnerstag, November 3, 2022 9:48 PM<br>
> An: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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) 😃<br>
>
>
>
>
> -----Original Message-----<br>
> From: Christofer Dutz <[christofer.dutz@c-ware.de](mailto:christofer.dutz@c-ware.de)><br>
> Sent: Thursday, November 3, 2022 9:27 PM<br>
> To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)<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 <[bossenti@posteo.de](mailto:bossenti@posteo.de)><br>
> Date: Thursday, 3. November 2022 at 21:15<br>
> To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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 <[zike@apache.org](mailto:zike@apache.org)><br>
> > > > Date: Thursday, 3. November 2022 at 15:29<br>
> > > > To: [dev@streampipes.apache.org](mailto:dev@streampipes.apache.org) <[dev@streampipes.apache.org](mailto:dev@streampipes.apache.org)><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>
> > > >
> > > > Best,<br>
> > > > Zike Yang<br>
> > > >
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Philipp Zehnder <ph...@bytefabrik.ai>.
Hi,
I am also in favor of renaming the branches.
@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.
Cheers,
Philipp
________________________________
Von: Dominik Riemer <ri...@fzi.de>
Gesendet: Donnerstag, November 3, 2022 9:48 PM
An: dev@streampipes.apache.org <de...@streampipes.apache.org>
Betreff: RE: [DISCUSS] What is the Master branch currently used for?
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 😉
https://cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps 😃
-----Original Message-----
From: Christofer Dutz <ch...@c-ware.de>
Sent: Thursday, November 3, 2022 9:27 PM
To: dev@streampipes.apache.org
Subject: Re: [DISCUSS] What is the Master branch currently used for?
Shouldn’t a force push to main/master/release help with that?
That’s what we do in PLC4X.
Chris
From: Tim <bo...@posteo.de>
Date: Thursday, 3. November 2022 at 21:15
To: dev@streampipes.apache.org <de...@streampipes.apache.org>
Subject: Re: [DISCUSS] What is the Master branch currently used for?
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.
What do you think about this? Are there any downsides of this that aren't on my radar now?
Best
Tim
Am 03.11.2022 21:12 schrieb Tim:
> I'm also in favour of this renaming.
>
> Best
> Tim
>
> Am 03.11.2022 21:01 schrieb Dominik Riemer:
>> Hi,
>>
>> yes, our master branch currently points to the latest release version.
>> I like the idea to rename "master" to "release" and "dev" to
>> "develop", what do you think?
>>
>> Cheers
>> Dominik
>>
>> On 2022/11/03 14:39:54 Christofer Dutz wrote:
>>> Hi,
>>>
>>> good point … also it tends to upset some people. Most projects
>>> settled on “main” instead of “master”.
>>> In the PLC4X project however we decided to call the development
>>> branch “develop” and the banch where we merge releases “release”.
>>> This way the branches sort of explain what they are themselves ;-)
>>>
>>> Chris
>>>
>>>
>>> From: Zike Yang <zi...@apache.org>
>>> Date: Thursday, 3. November 2022 at 15:29
>>> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
>>> Subject: [DISCUSS] What is the Master branch currently used for?
>>> Hi all,
>>>
>>> We use the `dev` branch as the default branch. But there still
>>> exists the master branch.[0] And it was still updated 21 days ago.
>>> I'm curious about what the master branch is currently used for.
>>>
>>> I think it's better to rename the master branch to another name if
>>> it has other usage because it will confuse developers if there is
>>> already a default branch. Sometimes I would accidentally checkout to
>>> master and then realize something was wrong.
>>>
>>> What's your thought?
>>>
>>> [0] https://github.com/apache/incubator-streampipes/tree/master
>>>
>>> Best,
>>> Zike Yang
>>>
RE: [DISCUSS] What is the Master branch currently used for?
Posted by Dominik Riemer <ri...@fzi.de>.
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 😉
https://cwiki.apache.org/confluence/display/STREAMPIPES/Post-release+steps 😃
-----Original Message-----
From: Christofer Dutz <ch...@c-ware.de>
Sent: Thursday, November 3, 2022 9:27 PM
To: dev@streampipes.apache.org
Subject: Re: [DISCUSS] What is the Master branch currently used for?
Shouldn’t a force push to main/master/release help with that?
That’s what we do in PLC4X.
Chris
From: Tim <bo...@posteo.de>
Date: Thursday, 3. November 2022 at 21:15
To: dev@streampipes.apache.org <de...@streampipes.apache.org>
Subject: Re: [DISCUSS] What is the Master branch currently used for?
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.
What do you think about this? Are there any downsides of this that aren't on my radar now?
Best
Tim
Am 03.11.2022 21:12 schrieb Tim:
> I'm also in favour of this renaming.
>
> Best
> Tim
>
> Am 03.11.2022 21:01 schrieb Dominik Riemer:
>> Hi,
>>
>> yes, our master branch currently points to the latest release version.
>> I like the idea to rename "master" to "release" and "dev" to
>> "develop", what do you think?
>>
>> Cheers
>> Dominik
>>
>> On 2022/11/03 14:39:54 Christofer Dutz wrote:
>>> Hi,
>>>
>>> good point … also it tends to upset some people. Most projects
>>> settled on “main” instead of “master”.
>>> In the PLC4X project however we decided to call the development
>>> branch “develop” and the banch where we merge releases “release”.
>>> This way the branches sort of explain what they are themselves ;-)
>>>
>>> Chris
>>>
>>>
>>> From: Zike Yang <zi...@apache.org>
>>> Date: Thursday, 3. November 2022 at 15:29
>>> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
>>> Subject: [DISCUSS] What is the Master branch currently used for?
>>> Hi all,
>>>
>>> We use the `dev` branch as the default branch. But there still
>>> exists the master branch.[0] And it was still updated 21 days ago.
>>> I'm curious about what the master branch is currently used for.
>>>
>>> I think it's better to rename the master branch to another name if
>>> it has other usage because it will confuse developers if there is
>>> already a default branch. Sometimes I would accidentally checkout to
>>> master and then realize something was wrong.
>>>
>>> What's your thought?
>>>
>>> [0] https://github.com/apache/incubator-streampipes/tree/master
>>>
>>> Best,
>>> Zike Yang
>>>
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Christofer Dutz <ch...@c-ware.de>.
Shouldn’t a force push to main/master/release help with that?
That’s what we do in PLC4X.
Chris
From: Tim <bo...@posteo.de>
Date: Thursday, 3. November 2022 at 21:15
To: dev@streampipes.apache.org <de...@streampipes.apache.org>
Subject: Re: [DISCUSS] What is the Master branch currently used for?
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.
What do you think about this? Are there any downsides of this that
aren't on my radar now?
Best
Tim
Am 03.11.2022 21:12 schrieb Tim:
> I'm also in favour of this renaming.
>
> Best
> Tim
>
> Am 03.11.2022 21:01 schrieb Dominik Riemer:
>> Hi,
>>
>> yes, our master branch currently points to the latest release version.
>> I like the idea to rename "master" to "release" and "dev" to
>> "develop", what do you think?
>>
>> Cheers
>> Dominik
>>
>> On 2022/11/03 14:39:54 Christofer Dutz wrote:
>>> Hi,
>>>
>>> good point … also it tends to upset some people. Most projects
>>> settled on “main” instead of “master”.
>>> In the PLC4X project however we decided to call the development
>>> branch “develop” and the banch where we merge releases “release”.
>>> This way the branches sort of explain what they are themselves ;-)
>>>
>>> Chris
>>>
>>>
>>> From: Zike Yang <zi...@apache.org>
>>> Date: Thursday, 3. November 2022 at 15:29
>>> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
>>> Subject: [DISCUSS] What is the Master branch currently used for?
>>> Hi all,
>>>
>>> We use the `dev` branch as the default branch. But there still exists
>>> the master branch.[0] And it was still updated 21 days ago. I'm
>>> curious about what the master branch is currently used for.
>>>
>>> I think it's better to rename the master branch to another name if it
>>> has other usage because it will confuse developers if there is
>>> already
>>> a default branch. Sometimes I would accidentally checkout to master
>>> and then realize something was wrong.
>>>
>>> What's your thought?
>>>
>>> [0] https://github.com/apache/incubator-streampipes/tree/master
>>>
>>> Best,
>>> Zike Yang
>>>
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Tim <bo...@posteo.de>.
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.
What do you think about this? Are there any downsides of this that
aren't on my radar now?
Best
Tim
Am 03.11.2022 21:12 schrieb Tim:
> I'm also in favour of this renaming.
>
> Best
> Tim
>
> Am 03.11.2022 21:01 schrieb Dominik Riemer:
>> Hi,
>>
>> yes, our master branch currently points to the latest release version.
>> I like the idea to rename "master" to "release" and "dev" to
>> "develop", what do you think?
>>
>> Cheers
>> Dominik
>>
>> On 2022/11/03 14:39:54 Christofer Dutz wrote:
>>> Hi,
>>>
>>> good point … also it tends to upset some people. Most projects
>>> settled on “main” instead of “master”.
>>> In the PLC4X project however we decided to call the development
>>> branch “develop” and the banch where we merge releases “release”.
>>> This way the branches sort of explain what they are themselves ;-)
>>>
>>> Chris
>>>
>>>
>>> From: Zike Yang <zi...@apache.org>
>>> Date: Thursday, 3. November 2022 at 15:29
>>> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
>>> Subject: [DISCUSS] What is the Master branch currently used for?
>>> Hi all,
>>>
>>> We use the `dev` branch as the default branch. But there still exists
>>> the master branch.[0] And it was still updated 21 days ago. I'm
>>> curious about what the master branch is currently used for.
>>>
>>> I think it's better to rename the master branch to another name if it
>>> has other usage because it will confuse developers if there is
>>> already
>>> a default branch. Sometimes I would accidentally checkout to master
>>> and then realize something was wrong.
>>>
>>> What's your thought?
>>>
>>> [0] https://github.com/apache/incubator-streampipes/tree/master
>>>
>>> Best,
>>> Zike Yang
>>>
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Tim <bo...@posteo.de>.
I'm also in favour of this renaming.
Best
Tim
Am 03.11.2022 21:01 schrieb Dominik Riemer:
> Hi,
>
> yes, our master branch currently points to the latest release version.
> I like the idea to rename "master" to "release" and "dev" to
> "develop", what do you think?
>
> Cheers
> Dominik
>
> On 2022/11/03 14:39:54 Christofer Dutz wrote:
>> Hi,
>>
>> good point … also it tends to upset some people. Most projects settled
>> on “main” instead of “master”.
>> In the PLC4X project however we decided to call the development branch
>> “develop” and the banch where we merge releases “release”. This way
>> the branches sort of explain what they are themselves ;-)
>>
>> Chris
>>
>>
>> From: Zike Yang <zi...@apache.org>
>> Date: Thursday, 3. November 2022 at 15:29
>> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
>> Subject: [DISCUSS] What is the Master branch currently used for?
>> Hi all,
>>
>> We use the `dev` branch as the default branch. But there still exists
>> the master branch.[0] And it was still updated 21 days ago. I'm
>> curious about what the master branch is currently used for.
>>
>> I think it's better to rename the master branch to another name if it
>> has other usage because it will confuse developers if there is already
>> a default branch. Sometimes I would accidentally checkout to master
>> and then realize something was wrong.
>>
>> What's your thought?
>>
>> [0] https://github.com/apache/incubator-streampipes/tree/master
>>
>> Best,
>> Zike Yang
>>
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Dominik Riemer <ri...@apache.org>.
Hi,
yes, our master branch currently points to the latest release version.
I like the idea to rename "master" to "release" and "dev" to "develop", what do you think?
Cheers
Dominik
On 2022/11/03 14:39:54 Christofer Dutz wrote:
> Hi,
>
> good point … also it tends to upset some people. Most projects settled on “main” instead of “master”.
> In the PLC4X project however we decided to call the development branch “develop” and the banch where we merge releases “release”. This way the branches sort of explain what they are themselves ;-)
>
> Chris
>
>
> From: Zike Yang <zi...@apache.org>
> Date: Thursday, 3. November 2022 at 15:29
> To: dev@streampipes.apache.org <de...@streampipes.apache.org>
> Subject: [DISCUSS] What is the Master branch currently used for?
> Hi all,
>
> We use the `dev` branch as the default branch. But there still exists
> the master branch.[0] And it was still updated 21 days ago. I'm
> curious about what the master branch is currently used for.
>
> I think it's better to rename the master branch to another name if it
> has other usage because it will confuse developers if there is already
> a default branch. Sometimes I would accidentally checkout to master
> and then realize something was wrong.
>
> What's your thought?
>
> [0] https://github.com/apache/incubator-streampipes/tree/master
>
> Best,
> Zike Yang
>
Re: [DISCUSS] What is the Master branch currently used for?
Posted by Christofer Dutz <ch...@c-ware.de>.
Hi,
good point … also it tends to upset some people. Most projects settled on “main” instead of “master”.
In the PLC4X project however we decided to call the development branch “develop” and the banch where we merge releases “release”. This way the branches sort of explain what they are themselves ;-)
Chris
From: Zike Yang <zi...@apache.org>
Date: Thursday, 3. November 2022 at 15:29
To: dev@streampipes.apache.org <de...@streampipes.apache.org>
Subject: [DISCUSS] What is the Master branch currently used for?
Hi all,
We use the `dev` branch as the default branch. But there still exists
the master branch.[0] And it was still updated 21 days ago. I'm
curious about what the master branch is currently used for.
I think it's better to rename the master branch to another name if it
has other usage because it will confuse developers if there is already
a default branch. Sometimes I would accidentally checkout to master
and then realize something was wrong.
What's your thought?
[0] https://github.com/apache/incubator-streampipes/tree/master
Best,
Zike Yang