Jarvis icon indicating copy to clipboard operation
Jarvis copied to clipboard
verified publisher icon sukeesh

dev -> master When to merge ?

Open antiDigest opened this issue 4 years ago • 4 comments

Maybe we can discuss here when it would be appropriate to merge the dev branch to master.

I'm thinking:

  • we can stop any merges to master, make master the main branch (which it already is) and only allow new plugins to dev. Maybe even organize new additions. Like every new plugin requires a unit test or something to be able to merge. (Maybe more of a long term plan here, but I think you get my point.)
  • But in the current scenario, I would suggest pausing all merges to master, and making dev the open branch to merge into. Reason being, master is already too different from dev, I think. Until we figure out how to make those same, better to keep merging open only to dev.

Thoughts @pnhofmann. We can tag other collaborators for more thoughts as well.

antiDigest avatar Jun 24 '21 15:06 antiDigest

Yeah, merge dev is really overdue. Next month I should have some time (I'd like to do some improvements on voice control). Then I would suggest, merge in August?

Reason being, master is already too different from dev, I think.

Yes, I'll take care of the diffs - I don't think that's a major problem. I would suggest, handle master and if dev is ready to merge, I'll just "backport" everything on master ;).

pnhofmann avatar Jun 27 '21 09:06 pnhofmann

I'm late. But it's still August ;)

A preview what I did so far: https://github.com/pnhofmann/Jarvis/commits/dev

OK, now everything I decided I want to change is implemented. But I know: Lots of stuff is still a bit broken. So I'll do testing the next days. Guess, I'll need ~2 weeks and then I'll write again.

pnhofmann avatar Aug 31 '21 14:08 pnhofmann

What's going on with this? Was dev originally planned to be the branch that all PR's would be made to and master would have the stable release?

Milind220 avatar Nov 10 '21 17:11 Milind220

Hi @Milind220 dev started with me experimenting stuff, but got lots of - I think - really interesting features. I consider it the next "release" of Jarvis. And yes, it should really been merged by now. Sorry - I currently have unexpectedly lots of stuff "around". But sometime dev will be ready ;).

Maybe, if you do stuff like in #913 (any improvements really appreciated ;) ) - consider switching to dev ;).

pnhofmann avatar Nov 14 '21 18:11 pnhofmann