Re: [infinispan-dev] Never push with --force
On 12 March 2014 16:01, Adrian Nistor <anistor(a)redhat.com> wrote:
Sanne, is it possible that you forgot to push his changes upstream
when
closing his PR?
Maybe that's what happened. I use a script though which pushes to both
so I think it's unlikely, and my own repo is second in order, it's
supposed to fail fast.
This is what the github news feed of infinispan repo tells me:
1. Dan opened the PR #2433 yesterday (about 20 hrs ago)
2. you closed his PR after a few hours (15 hrs ago) and commented
'Merged', but I cannot see a 'pushed to master' entry in newsfeed around
this time
3. You pushed upstream this morning (7 hrs ago)
I would never expect --force being used on the upstream repo. Whoever
does it should ask permission first and have a good reason, not just
warn the list about it.
+1
Yes I'm not sure what happened, just sharing it as a reminder.
On 03/12/2014 11:27 AM, Sanne Grinovero wrote:
> Yesterday I pushed a fix from Dan upstream, and this morning the fix
> wasn't there anymore. Some unrelated fix was merged in the meantime.
>
> I only realized this because I was updating my personal origin and git
> wouldn't allow me to push the non-fast-forward branch, so in a sense I
> could detect it because of how our workflow works (good).
>
> I have no idea of how it happened, but I guess it won't hurt to remind
> that we should never push with --force, at least not without warning
> the whole list.
>
> I now cherry-picked and fixed master by re-pushing the missing patch,
> so nothing bad happening :-)
>
> Sanne
> _______________________________________________
> infinispan-dev mailing list
> infinispan-dev(a)lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/infinispan-dev
_______________________________________________
infinispan-dev mailing list
infinispan-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/infinispan-dev