Re: [infinispan-dev] Reminders about GIT
On 18 Oct 2011, at 17:50, Mircea Markus wrote: It's like the good rule of never commit when you're drunk (coding is allowed). ROFL! Excellent! :-) -- Manik Surtani ma...@jboss.org twitter.com/maniksurtani Lead, Infinispan http://www.infinispan.org ___ infinispan-dev mailing list infinispan-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev
Re: [infinispan-dev] Reminders about GIT
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@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev -- Manik Surtani ma...@jboss.org twitter.com/maniksurtani Lead, Infinispan http://www.infinispan.org ___ infinispan-dev mailing list infinispan-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev
Re: [infinispan-dev] Reminders about GIT
On 27 October 2011 14:22, Manik Surtani ma...@jboss.org wrote: Sanne - you should add this as a warning section to https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control :-) Done ___ infinispan-dev mailing list infinispan-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev
[infinispan-dev] Reminders about GIT
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@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev
Re: [infinispan-dev] Reminders about GIT
Nice! On Tue, Oct 18, 2011 at 6:16 PM, Sanne Grinovero sa...@infinispan.org wrote: Almost forgot the main tip; use: git config branch.master.mergeoptions --ff-only It will prevent a non-linear creating merge with an error as fatal. Not possible to fast-forward, aborting. Cheers, Sanne On 18 October 2011 16:09, Sanne Grinovero sa...@infinispan.org 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@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev ___ infinispan-dev mailing list infinispan-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev
