Commit is removed upstream. Please do git reset --hard origin/master in
your tree. When on master branch if you have no work on master branch and
git rebase -I origin/master and remove commit manually otherwise
Le 3 nov. 2015 4:59 AM, "Andrei Borzenkov" <arvidj...@gmail.com> a écrit :

> 31.10.2015 16:46, Andrei Borzenkov пишет:
>
>> 31.10.2015 10:02, Andreas Schwab пишет:
>>
>>> Kaz Kylheku <k...@kylheku.com> writes:
>>>
>>> Nope. They will have a git in which that commit looks like their own
>>>> local work. *Someone* will inadvertently do a "git push" to blast out
>>>> their changes based on that deleted commit, thereby causing it to
>>>> reappear.
>>>>
>>>
>>> Not if another one pushes something different in the mean time.
>>>
>>>
>> Which is why I said "amended".
>>
>
> Actually I was probably wrong. "git pull" will see non-ff case and will
> attempt merge of remote and local, unless merge.ff=only is set.
>
> So we can only hope that everyone who has commit rights reads this list
> and will check local clone and do rebase to wipe out this commit if
> necessary. Otherwise it will be resurrected indeed.
>
> May be it's not worse the trouble then to remove it.
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to