As long as you don't force push (which is disabled), I think the preferred option for dealing with accidentally pushed changes is to push a "revert" commit generated from git revert

I think that's the right approach, so closing. Feel free to reopen though

In order to maintain a list of currently relevant issues, we mark issues as stale after a period of inactivity

If this issue remains relevant, please comment here or remove the stale label; otherwise it will be marked as closed automatically

this was actually not that dangerous since everyone who synced the git history (i.e. at least @max-sixty) before that accident had a full "backup" of the commit history.

Would it make sense to add a section for "people with commit access" to contributing.rst? I imagine this could be useful as a reference and for new maintainers...

I think the preferred option for dealing with accidentally pushed changes is to push a "revert" commit generated from git revert

OK, understood.

but as long as we keep the master branch protected, it's always possible always possible to move forward by reverting changes -- there is no way to lose work.

Then, probably the most dangarous part was when I unprotected the master branch. I was afraid of messing up the commit history, but it is much better than losing entire commit history...

But anyways, this is not a big deal at all! Git makes it very easy to mess things up, but as long as we keep the master branch protected, it's always possible always possible to move forward by reverting changes -- there is no way to lose work.

As long as you don't force push (which is disabled), I think the preferred option for dealing with accidentally pushed changes is to push a "revert" commit generated from git revert

It looks like @keewis isn't in https://github.com/orgs/pydata/teams/xarray/members so he couldn't change the permissions, can we change that? I think only @shoyer can add people to that team.

Me and @jhamman seem to be in both that team and added to https://github.com/pydata/xarray/settings/access, which seems redundant (though not causing any bad outcomes either)

No stress @fujiisoup ! Glad this worked out.

We could disable push access and then people can manually re-enable when necessary. But no strong view.

you could try to undo that by: getting the hash of the latest commit (7bf9df9d75c40bcbf2dd28c47204529a76561a3f right now), then calling sh git reset <hash> git push -f

Since I've been afraid of that mistake as well, I added a git hook that makes git refuse to push to master and stable on the main repository (use --no-verify to override it): ```bash $ cat .git/hooks/pre-push

!/usr/bin/env bash

protected_remotes="origin" protected_branches="master stable"

isin() { local list="$1" local substring="$2"

for element in $list
do
    [[ "$element" == "$substring" ]] && return 0;
done

return -1;

}

readonly() { remote="$1" branch="$2"

if isin "$protected_remotes" "$remote" && isin "$protected_branches" "$branch"
then
    return 0;
else
    return -1;
fi

}

remote="$1"

IFS=" " while read local_ref local_sha remote_ref remote_sha do branch="$(echo $remote_ref | sed 's#^refs/heads/##g')" if readonly "$remote" "$branch" then echo "cannot push to $remote/$branch: protected branch. Use --no-verify to override this." exit -1 fi done ```

OK, thanks.

So I think either a pre-push hook or git config branch.master.pushRemote no_push (but then you also can't push to your own master anymore) are the best way forward

Agreed. I'll use your pre-push hook. Thanks @keewis .

see this SO question. However, I don't think we should try that since there are a few cases where you still need to push without a PR (releasing, mainly). So I think either a pre-push hook or git config branch.master.pushRemote no_push (but then you also can't push to your own master anymore) are the best way forward

BTW, is it possible to disallow direct push to master on github? Maybe we only need to merge PRs and but not push.

OK. Done. Thanks. I'll use your script. Thanks.

And sorry again for my mistake.

oh, yeah. Then someone with the appropriate permissions (you? or maybe @shoyer?) has to temporarily remove the branch protection (settings on github), force push, and then add back the branch protection.

Maybe I can unprotect the master, but I'm hesitating this action...

Thanks. but it looks the master is protected and I cannot force push. Total 0 (delta 0), reused 0 (delta 0) remote: error: GH006: Protected branch update failed for refs/heads/master. remote: error: Cannot force-push to this protected branch To https://github.com/pydata/xarray.git ! [remote rejected] master -> master (protected branch hook declined) error: failed to push some refs to 'https://github.com/pydata/xarray.git'