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/3244#issuecomment-525396502,https://api.github.com/repos/pydata/xarray/issues/3244,525396502,MDEyOklzc3VlQ29tbWVudDUyNTM5NjUwMg==,1217238,2019-08-27T17:11:40Z,2019-08-27T17:11:40Z,MEMBER,"We recommend using ""merge master"". It looks like our contributor guidelines
need to be updated here so don't hesitate to ask any questions.

On Tue, Aug 27, 2019 at 8:53 AM ulijh <notifications@github.com> wrote:

> May be this is a stupid question: What's the best way to resolve this
> conflict, and get the checks to run? Should I do a merge master? Or rebase
> (seems somewhat of a pain to get the remote up to date)? Thanks for the
> advice!
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/pydata/xarray/pull/3244?email_source=notifications&email_token=AAJJFVQAAE3MFYV7TYISC5LQGVEY3A5CNFSM4IOZF562YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5IHB2I#issuecomment-525365481>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AAJJFVVE2BSI2T76X6CAHC3QGVEY3ANCNFSM4IOZF56Q>
> .
>
","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,484212164