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 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 > , > or mute the thread > > . > ","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,484212164 https://github.com/pydata/xarray/pull/3244#issuecomment-525367937,https://api.github.com/repos/pydata/xarray/issues/3244,525367937,MDEyOklzc3VlQ29tbWVudDUyNTM2NzkzNw==,2448579,2019-08-27T15:59:16Z,2019-08-27T15:59:16Z,MEMBER,Merge master is enough. I just did it to kick off the tests.,"{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,484212164 https://github.com/pydata/xarray/pull/3244#issuecomment-524077985,https://api.github.com/repos/pydata/xarray/issues/3244,524077985,MDEyOklzc3VlQ29tbWVudDUyNDA3Nzk4NQ==,5635139,2019-08-22T21:07:15Z,2019-08-22T21:07:15Z,MEMBER,"This looks good @ulijh ! Thanks Could you add a test? Also feel free to give yourself credit in a whatsnew","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,484212164