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/4314#issuecomment-676589767,https://api.github.com/repos/pydata/xarray/issues/4314,676589767,MDEyOklzc3VlQ29tbWVudDY3NjU4OTc2Nw==,14808389,2020-08-19T18:30:34Z,2020-08-19T18:30:34Z,MEMBER,"I've opened a PR to update the guide, hopefully that helps.","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-676576773,https://api.github.com/repos/pydata/xarray/issues/4314,676576773,MDEyOklzc3VlQ29tbWVudDY3NjU3Njc3Mw==,14808389,2020-08-19T18:03:23Z,2020-08-19T18:03:23Z,MEMBER,"I think it should be ```sh git checkout master git pull git checkout git merge master git push ``` or ```sh git fetch upstream git merge upstream/master git push ``` instead","{""total_count"": 1, ""+1"": 1, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-676575840,https://api.github.com/repos/pydata/xarray/issues/4314,676575840,MDEyOklzc3VlQ29tbWVudDY3NjU3NTg0MA==,14808389,2020-08-19T18:01:22Z,2020-08-19T18:01:22Z,MEMBER,"ah, now I understand where the duplication is coming from. I'm guessing you did that and then tried to push, but it complained about different commits, so you pulled and then pushed. I fixed it for you. I think we should update that guide, rebasing is usually not a good idea because then you'd have to force-push, too (and github doesn't handle force-pushing that well).","{""total_count"": 1, ""+1"": 1, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-676563830,https://api.github.com/repos/pydata/xarray/issues/4314,676563830,MDEyOklzc3VlQ29tbWVudDY3NjU2MzgzMA==,14808389,2020-08-19T17:35:57Z,2020-08-19T17:38:46Z,MEMBER,"which command did you use to create the merge? I think that was some sort of rebase merge, which means that all merged commits are included in the commit history, and github doesn't seem to work well with this kind of merges. You also have duplicated commits in the history, which confuses me. Edit: it seems you somehow merged / rebased the branch onto itself. Just as reference, I usually use ```sh git checkout master git pull git checkout git merge master git push ``` for merging","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-676554163,https://api.github.com/repos/pydata/xarray/issues/4314,676554163,MDEyOklzc3VlQ29tbWVudDY3NjU1NDE2Mw==,14808389,2020-08-19T17:16:35Z,2020-08-19T17:16:35Z,MEMBER,could you merge in `master`? I think that would fix the failing build.,"{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-673746915,https://api.github.com/repos/pydata/xarray/issues/4314,673746915,MDEyOklzc3VlQ29tbWVudDY3Mzc0NjkxNQ==,14808389,2020-08-13T22:47:01Z,2020-08-19T16:10:03Z,MEMBER,"I think that was due to a rebase merge (?). I fixed the commit history using cherry-picking and force-pushed to your branch, but there's a [backup of the old branch](https://github.com/pydata/xarray/tree/astypekeepattrs-backup) if something went wrong. @dnowacki-usgs, if you want to add new commits you'll first have to force-pull (or delete your local branch and check out the remote branch – just make sure that you don't lose any unpushed commits).","{""total_count"": 3, ""+1"": 3, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961 https://github.com/pydata/xarray/pull/4314#issuecomment-672254759,https://api.github.com/repos/pydata/xarray/issues/4314,672254759,MDEyOklzc3VlQ29tbWVudDY3MjI1NDc1OQ==,14808389,2020-08-11T20:11:51Z,2020-08-11T20:11:51Z,MEMBER,"I think that's a false positive, our `flake8` and `black` CI don't report that. I guess the bot will remove that `FileNotFoundError` report once you push a new commit, so it should be safe to ignore it.","{""total_count"": 0, ""+1"": 0, ""-1"": 0, ""laugh"": 0, ""hooray"": 0, ""confused"": 0, ""heart"": 0, ""rocket"": 0, ""eyes"": 0}",,673757961