[Git][noosfero/noosfero][master] 4 commits: scheduler: defer off-request work

[Antonio Terceiro]

On Wed, Jul 22, 2015 at 10:02:02AM -0300, Bráulio Bhavamitra wrote:
> why is weblate performing merges? it pushed the commits I have deleted
> yesterday.

because it pulled the repository before you did the push -f.

you should never, never, push -f to public branches. if you made a
mistake and want to fix it, use `git revert` and push actual commits
that revert the changes.

As we discussed on IRC, in this specific case just let it alone, since
it's a rather low-risk change and a plugin which by definition is
optional and not enabled by default.

-- 
Antonio Terceiro <terceiro at colivre.coop.br>
Colivre - Cooperativa de Tecnologias Livres
http://www.colivre.coop.br/


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150722/a71789f8/attachment.pgp>