Timeline for How to reconcile "misc fix" commits with pull requests?
Current License: CC BY-SA 3.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 3, 2017 at 20:58 | comment | added | F.X. | Just noticed I never actually accepted your answer. 2 years later, this is pretty much what I ended up doing, so your advice was spot on! Thanks! | |
| Mar 3, 2017 at 20:58 | vote | accept | F.X. | ||
| Apr 4, 2015 at 22:32 | comment | added | Mark A. Hershberger | Right, typos in comments and whitespace changes (e.g converting tabs to spaces or vice versa) are should be grouped together away from the actual bug fix. | |
| Jan 20, 2015 at 4:04 | comment | added | J Trana | So, looking from some clarification here from @MarkAHershberger - you're stating code cleanup as a single commit. In my book, code cleanup is not equal to bug fix - so typos and comments would be in, bug fixes would be out. Is that what you're meaning here too? | |
| Jan 19, 2015 at 22:25 | comment | added | amon | @F.X. In general, prefer many small commits and pull requests over large ones that do a number of different things. This makes them much easier to review, makes it easier to determine where and when (and by whom) a problem was introduced, and simplifies merging of the changes (less large conflicts!). It does make sense to group small cleanup actions into a single commit, but if it's a noticeable improvement, it should be offered to others as a PR immediately. | |
| Jan 19, 2015 at 21:58 | comment | added | F.X. | Thanks! Would you make a separate PR for the cleanup commit(s), or include them at the beginning of the PR you're working on? | |
| Jan 19, 2015 at 21:40 | review | First posts | |||
| Jan 19, 2015 at 22:08 | |||||
| Jan 19, 2015 at 21:38 | history | answered | Mark A. Hershberger | CC BY-SA 3.0 |