Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove rebasing from suggestions in CONTRIBUTING.md #724

Merged
merged 7 commits into from
May 1, 2020
Merged

Remove rebasing from suggestions in CONTRIBUTING.md #724

merged 7 commits into from
May 1, 2020

Conversation

tstirrat
Copy link
Contributor

Updates the contribution guide to not suggest rebasing

It's causing broken histories in many PRs, slowing down the time to review.

Suggesting merge directly from upstream/develop instead, which is cleaner and more up-to-date.

@tstirrat tstirrat added question Further information is requested devprod Request for developer productivity (dev tools, CI, linters, etc). labels Apr 29, 2020
kenpugsley
kenpugsley previously approved these changes Apr 29, 2020
View reviewed changes
Copy link
Collaborator

@kenpugsley kenpugsley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow ... I guess I never read that section closely. Yes, I very much approve of us telling people to merge with upstream/develop rather than rebase. Good call.

@tstirrat tstirrat marked this pull request as ready for review April 29, 2020 16:43
@kenpugsley kenpugsley self-requested a review April 29, 2020 17:13
kenpugsley
kenpugsley requested changes Apr 29, 2020
View reviewed changes
CONTRIBUTING.md Show resolved Hide resolved
@kenpugsley kenpugsley self-requested a review April 29, 2020 17:23
kenpugsley
kenpugsley previously approved these changes Apr 29, 2020
View reviewed changes
@tstirrat tstirrat requested a review from kenpugsley April 29, 2020 18:31
@tstirrat tstirrat merged commit 0fd622d into develop May 1, 2020
@tstirrat tstirrat deleted the ts-contributing-no-rebase branch May 1, 2020 02:19
tstirrat added a commit to eyganeshv/covid-safe-paths that referenced this pull request May 1, 2020
@tstirrat
Merge branch 'develop' into pr/eyganeshv/521
c61f562 
* develop:
  Update dev README (Path-Check#705)
  Better error logging in Google import (Path-Check#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (Path-Check#724)
  Translation refresh (Path-Check#708)
  updated issue template (Path-Check#729)
tstirrat added a commit that referenced this pull request May 2, 2020
@tstirrat
Merge branch 'develop' into ts-icon-button
0a217c8 
* develop:
  Recommend PR best practices in PR template (#750)
  Add eslint react-hooks checks (#751)
  iOS: Added local notification in terminate function. (#521)
  Update dev README (#705)
  Better error logging in Google import (#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (#724)
  Translation refresh (#708)
  updated issue template (#729)
  Set up location after skiping the steps (#721)
  App shows green icon when tracking is inactive (#722)
  Fix postinstall script on Windows (#720)
  Fix isVersionGreater and add tests (#726)
  update the upgrade version to 1.0.0, to match what is in the master branch and avoid mistaken forced upgrades. (#723)
  1.0.1 (#715)
  Put GPS filter behind dev flag (#714)
  Fix headline1 text cutoff (#712)
  Put auto sub behind dev flags (#711)
  remove default news url from News.js constructor (#704)
  Fix i18n placeholder for authorities (#709)
tstirrat added a commit that referenced this pull request May 2, 2020
@tstirrat
Merge branch 'develop' into ts-theme-button
4b91a3e 
* develop: (60 commits)
  Recommend PR best practices in PR template (#750)
  Add eslint react-hooks checks (#751)
  iOS: Added local notification in terminate function. (#521)
  Update dev README (#705)
  Better error logging in Google import (#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (#724)
  Translation refresh (#708)
  updated issue template (#729)
  Set up location after skiping the steps (#721)
  App shows green icon when tracking is inactive (#722)
  Fix postinstall script on Windows (#720)
  Fix isVersionGreater and add tests (#726)
  update the upgrade version to 1.0.0, to match what is in the master branch and avoid mistaken forced upgrades. (#723)
  1.0.1 (#715)
  Put GPS filter behind dev flag (#714)
  Fix headline1 text cutoff (#712)
  Put auto sub behind dev flags (#711)
  remove default news url from News.js constructor (#704)
  Fix i18n placeholder for authorities (#709)
  Remove react-native-maps (#695)
  ...
tstirrat added a commit that referenced this pull request May 3, 2020
@tstirrat
Merge branch 'develop' into ts-feature-flags
a14deaa 
* develop:
  Add language contribution info to contributing guide (#754)
  Recommend PR best practices in PR template (#750)
  Add eslint react-hooks checks (#751)
  iOS: Added local notification in terminate function. (#521)
  Update dev README (#705)
  Better error logging in Google import (#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (#724)
tstirrat added a commit that referenced this pull request May 4, 2020
@tstirrat
Merge branch 'develop' into ts-eula-i18n
6f8fbc2 
* develop:
  Build time feature flags (Phase 1) (#694)
  Extract theme aware <IconButton /> component (#756)
  Latest i18n pull (#755)
  Add language contribution info to contributing guide (#754)
  Recommend PR best practices in PR template (#750)
  Add eslint react-hooks checks (#751)
  iOS: Added local notification in terminate function. (#521)
  Update dev README (#705)
  Better error logging in Google import (#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (#724)
aputinski pushed a commit to safe-paths-contrib/covid-safe-paths that referenced this pull request May 6, 2020
Merge remote-tracking branch 'official/develop' into survey
734ad7a 
* official/develop: (110 commits)
  Consolidate to a single theme aware Button component (Path-Check#767)
  Fixed incorrect pull command. (Path-Check#769)
  Update README, etc for tripleblind -> Path-Check (Path-Check#768)
  HTML EULA translation workflow (Path-Check#710)
  Allowing setup on macOS/Darwin for Android only. (Path-Check#766)
  Add Danish to the list of languages. (Path-Check#765)
  Fixed the aspect ration on the icon and add links (Path-Check#763)
  Build time feature flags (Phase 1) (Path-Check#694)
  Extract theme aware <IconButton /> component (Path-Check#756)
  Latest i18n pull (Path-Check#755)
  Add language contribution info to contributing guide (Path-Check#754)
  Recommend PR best practices in PR template (Path-Check#750)
  Add eslint react-hooks checks (Path-Check#751)
  iOS: Added local notification in terminate function. (Path-Check#521)
  Update dev README (Path-Check#705)
  Better error logging in Google import (Path-Check#703)
  Remove rebasing from suggestions in CONTRIBUTING.md (Path-Check#724)
  Translation refresh (Path-Check#708)
  updated issue template (Path-Check#729)
  Set up location after skiping the steps (Path-Check#721)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kenpugsley kenpugsley kenpugsley approved these changes

@Patrick-Erichsen Patrick-Erichsen Awaiting requested review from Patrick-Erichsen

Assignees
No one assigned
Labels
devprod Request for developer productivity (dev tools, CI, linters, etc). question Further information is requested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tstirrat @kenpugsley