[Scummvm-devel] merging

[Filippos Karapetis]

Sounds good to me too, nicely written!

We should put this in the wiki

Regards
Filippos

On Sun, Jun 10, 2012 at 4:35 AM, Johannes Schickel <lordhoto at gmail.com>wrote:

> On 06/07/2012 02:48 PM, Willem Jan Palenstijn wrote:
> > After some IRC discussion about the merits of rebasing and merging in git
> > recently, I've written up some notes/suggestions on the topic below.
> >
> > Any comments? Additional good advice? Different opinions?
> >
>
> Great! Thanks for coming up with this.
>
> // Johannes
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>



-- 
"Experience is the name every one gives to their mistakes" - Oscar Wilde
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20120612/575818e4/attachment.html>