search

nyxnor / tor-ctrl

Raw use of tor's controller
Other
5 stars 3 forks source link

create development branch someone else starts contributing #7

Closed nyxnor closed 2 years ago

nyxnor commented 2 years ago

lot of changes on the script in past commit, create a dev branch when it is need.

nyxnor commented 2 years ago

@adrelanos if you feel it is needed, let me know.

adrelanos commented 2 years ago

No, I don't see much need for it right now.

Changes are usually small, non-controversial. So easy to merge into master branch. This is a small code base, which is a feature, not a bug. I don't think enough development happening to warrant a stable and different development branch.

If someone wants another branch in their repository they won't have write access here anyhow.

The question is, since you're upstream here, do you think you need to have a development branch and merge things there, test over some time and only then merge into master? If not, then no need. If you have a development branch, then a stable branch is a kind of "service" being provided to those who want to stay on stable. I don't see that kind of complexity here and that's a good thing for change.

nyxnor commented 2 years ago

thank you for the detailed explanation.

The question is, since you're upstream here, do you think you need to have a development branch and merge things there, test over some time and only then merge into master?

No. I test locally before pushing, just in case you made a big change, although merging conflicts should be easy to solve in this small codebase.