issue_comments: 514325568

This data as json

html_url issue_url id node_id user created_at updated_at author_association body reactions performed_via_github_app issue
https://github.com/pydata/xarray/pull/3142#issuecomment-514325568 https://api.github.com/repos/pydata/xarray/issues/3142 514325568 MDEyOklzc3VlQ29tbWVudDUxNDMyNTU2OA== 5635139 2019-07-23T18:19:46Z 2019-07-23T18:19:46Z MEMBER

I think we can suggest something like this to existing PRs to eliminate manual conflicts, and I'm attempting to find something more official. Let me know if anyone knows of something:

  • Merge master prior to the black commit (any conflicts are real conflicts and require resolving)
  • Apply black . to this branch
  • Merge master at the black commit, resolving in favor of our changes: git merge [black-commit] -X ours
  • Merge current master (any conflicts here are real and again require resolving) 
{
    "total_count": 0,
    "+1": 0,
    "-1": 0,
    "laugh": 0,
    "hooray": 0,
    "confused": 0,
    "heart": 0,
    "rocket": 0,
    "eyes": 0
}
   469871658