[infinispan-dev] Reminders about GIT

[Manik Surtani]

Sanne - you should add this as a warning section to https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control :-)

On 18 Oct 2011, at 16:09, Sanne Grinovero wrote:

> 1) If you have warnings about "Merge made by recursive" you have to
> fix it rebasing.
> 
> 2) If you have warnings about "non-fast-forward" you have to rebase.
> 
> 3) If you see "non-fast-forward updates were rejected" you shall never
> use "force" on upstream! It means that another patch was merged before
> you and you have to update your master again, and rebase again.
> 
> 4) "force" is allowed only in special maintenance circumstances. If
> you find you're needing it to handle a pull request, then you're doing
> it wrong, and the mistake might be a dangerous one. It's like the good
> rule of never commit when you're drunk (coding is allowed).
> _______________________________________________
> infinispan-dev mailing list
> infinispan-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/infinispan-dev

--
Manik Surtani
manik at jboss.org
twitter.com/maniksurtani

Lead, Infinispan
http://www.infinispan.org



-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/infinispan-dev/attachments/20111027/3b26c0e2/attachment.html