search

freifunk / openwrt-packages

Freifunk specific global OpenWrt Packages
Apache License 2.0
26 stars 33 forks source link

README: add rules for commiting to the repo #7

Closed SvenRoederer closed 5 years ago

pmelange commented 5 years ago

Addition is spelt wrong. Also, according to the openwrt rules, commits have to be signed. Are we going to use that rule too?

SvenRoederer commented 5 years ago

the "Patches and Pull requests:" I would just handle as noted in the referenced OpenWrt guideline (requiring and SoB)

booo commented 5 years ago

Are we talking about rules or are we talking about guidelines. I prefer the term guidelines here!

https://wikidiff.com/guideline/rule

In the end we use a distributed version control system and mistakes can be made.

Please link to content that explains your guidelines. The current three guidelines are not precise enough and contradict each other ("no force push" vs. "rebasing some branches").

There should be some guidelines about good commit messages incl. the body of a commit message.

SvenRoederer commented 5 years ago

The current three guidelines are not precise enough and contradict each other ("no force push" vs. "rebasing some branches").

Where is a contradiction? Rebasing an external branch of a PR onto one of our branches will not conflict with the "no-force" rule (see https://github.com/freifunk-berlin/firmware/pull/652#event-2163333583).

pmelange commented 5 years ago

I prefer the term guidelines too. I also think we have a good start that we can clearly improve upon. If nobody has an specific changes to the text, then I think we should merge this.

SvenRoederer commented 5 years ago

changed wording to use the guideline term

SvenRoederer commented 5 years ago

merging, as there are no additional comments or complains