friendica - Link to source

Constantly updating "develop" with the changes from the rc?

A question to all people who are doing development, means @Artur Weigandt, @Philipp Holzer, @Tobias, @Random Penguin, @Raroun, @Marcus and wo ever I forgot.

To be able to continue development, I really would like to merge all commits from rc to the current develop branch. What's your opinion?

Also: how should we do it if we agree to do it? Direct merging, or a pull request?

@Philipp Holzer @Tobias @Raroun @Artur Weigandt @Marcus @Random Penguin
in reply to Michael 🇺🇦
friendica - Link to source

Artur Weigandt

@Michael 🇺🇦 @Tobias @Philipp Holzer @Raroun @Marcus @Random Penguin

Porting RC to develop should be a constant process. I recommend to do it with a PR like we have done it in the past.

@Philipp Holzer @Tobias @Michael 🇺🇦 @Raroun @Marcus @Random Penguin
in reply to Philipp Holzer
friendica - Link to source

Artur Weigandt

In best case we only have the develop branch and we are only bug fixing on the (feature freezed) RC branch and porting them with a PR to develop. The need for constantly porting RC into develop should also be an exception and is only needed if the RC phase takes longer than planned.
in reply to Michael 🇺🇦
friendica - Link to source

Hypolite Petovan

@Michael 🇺🇦 @Tobias @Philipp Holzer @Raroun @Artur Weigandt @Marcus @Random Penguin Voting for regular merges as needed. In the past we’ve done one big merge on release date from RC to develop but it could be spread over time.
@Philipp Holzer @Tobias @Michael 🇺🇦 @Raroun @Artur Weigandt @Marcus @Random Penguin