Skip to content

Commit

Permalink
Update code-of-repo-conduct.md
Browse files Browse the repository at this point in the history
  • Loading branch information
refaktor authored Mar 24, 2024
1 parent 573de9b commit 9484ced
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions code-of-repo-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ We shouldn't have too many principles (or rules), we are not trying to create a

## Q&A

How can I create commits / PR-s / merge them so that Github homepage feed and release notes are as informative as possible?
### How to create commits / PR-s / merge them so that feed and release notes are as informative as possible?

_work-in-progress-text-propose-changes_

If there is only one commit per PR then the message is stored and used (check this).

If there are multiple commits's then messages get lost unless we merge with *Squash and merge*. This joins messages together and uses them (positive) but also joins all code changes into one commit.
A) If reason for multiple commits is iterating on a set of changes, or making them comple (adding tests, making golint-ci pass, ...) then this makes sense.
B) If PR is composed of multiple commits each for different set of changes then some information is lost with Squash.

* Should the choice be per-case based?
* What to do in case (B) then?
* Is there a third option?
* Should in case of (B) these be multiple PR-s anyway?



...

0 comments on commit 9484ced

Please sign in to comment.