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 <[email protected]> Gesendet: Donnerstag, November 3, 2022 9:48 PM An: [email protected] <[email protected]> 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 <[email protected]> Sent: Thursday, November 3, 2022 9:27 PM To: [email protected] 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 <[email protected]> Date: Thursday, 3. November 2022 at 21:15 To: [email protected] <[email protected]> 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 <[email protected]> >>> Date: Thursday, 3. November 2022 at 15:29 >>> To: [email protected] <[email protected]> >>> 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 >>>
