[bind10-dev] git reset on master

[Stephen Morris]

On 11/05/2011 08:34, Michal 'vorner' Vaner wrote:
> Hello
> 
> This is small warning message. Likun wanted to revert a merge on master and did
> a reset instead (google sometimes recommend strange things). This is not
> necessarily bad, but if you had a copy with the merge and pull, you get the
> merge back, possibly introducing some other funky stuff.
> 
> So, please, before you do anything with master, do this:
> 
> git checkout master
> git fetch
> git reset --hard origin/master
> 
> This actually throws away your version of master, but you should not have any
> changes on top of it anyway, so it should be safe in that sense and it can
> prevent some possible inconvenience.
> 
> Anyway, we should not do resets and anything that asks you to give -f to push on
> public branches, like master. If someone from outside the team would be
> following it, it could do bad things to him as well.

Could you add something to the Git Workflow pages in the wiki about this?

Stephen