Pablo-WMDE added subscribers: Jakob_WMDE, WMDE-leszek, Pablo-WMDE. Pablo-WMDE added a comment.
> Make squash merging the only option for merging While there is a place for "squash merging", namely PRs which only contain commits which correct each other or complement each other in a way that they can not be separated, this is not always the case. Many PRs the developers create contain multiple "local unit" commits <https://homes.cs.washington.edu/~mernst/advice/version-control.html#logical-unit> the individual history of which is worth preserving. "Rebase and merge" merging allows for both approaches but puts the decision of how to cut the commits in the authors' hands. > Make sure that the branch is up-to-date before merging FWIW we had this on during the hike. Would be interesting - also for future reference - to hear the reasons why it was turned off, now that this decision is revised. TASK DETAIL https://phabricator.wikimedia.org/T264446 EMAIL PREFERENCES https://phabricator.wikimedia.org/settings/panel/emailpreferences/ To: Pablo-WMDE Cc: Pablo-WMDE, WMDE-leszek, Jakob_WMDE, Aklapper, Sarai-WMDE, Akuckartz, darthmon_wmde, Nandana, Lahi, Gq86, GoranSMilovanovic, QZanden, LawExplorer, _jensen, rosalieper, Scott_WUaS, Volker_E, Wikidata-bugs, aude, Lydia_Pintscher, Mbch331
_______________________________________________ Wikidata-bugs mailing list Wikidata-bugs@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikidata-bugs
