[bind10-dev] git reset on master

Michal 'vorner' Vaner michal.vaner at nic.cz
Wed May 11 07:34:59 UTC 2011


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.

Thank you

You can fool some of the people all of the time,
and all of the people some of the time,
but you can make a fool of yourself anytime.

Michal 'vorner' Vaner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <https://lists.isc.org/pipermail/bind10-dev/attachments/20110511/222807ec/attachment.bin>

More information about the bind10-dev mailing list