Sounds good and reasonable to me. Are my previous contributions merged, or
should I rebase them?
/Jakob
2009/12/4 Vlad Dumitrescu <vladd...@gmail.com>
> Dear all,
>
> The way we did branching wasn't very good (at least from my point of
> view, as integrator) and I would like to suggest we try something
> different. This "new" way is the one that is actually used by other
> projects (git itself and erlang/otp are examples).
>
> The wiki guidelines at http://wiki.github.com/erlide/erlide will be
> updated soon with this new information.
>
> * Branches
>
> The main repository has three branches:
>
> - master: points to the latest stable release.
> - next: collects the changes to be included in the next release
> - pu: (proposed updates) collects changes that aren't ready yet, but
> can be tried and given feedback.
>
> * Rules
>
> - 'Master' will never be rebased.
> - 'Next' may be recreated at the time of a new release, to point at
> the master's HEAD. So it is usually safe to branch off it until the
> next release, but unless your change depends on something already in
> 'next' but not in 'master', please use 'master' instead.
> - 'Pu' may be rebased at any time, don't branch from it!
> - Topic branches must be branched off master. The only exception is if
> your fix depends on some other fix that hasn't made it to the master
> yet.
> - The nightly builds are done from 'next'.
>
> best regards,
> Vlad
>
>
> ------------------------------------------------------------------------------
> Join us December 9, 2009 for the Red Hat Virtual Experience,
> a free event focused on virtualization and cloud computing.
> Attend in-depth sessions from your desk. Your couch. Anywhere.
> http://p.sf.net/sfu/redhat-sfdev2dev
> _______________________________________________
> Erlide-devel mailing list
> Erlide-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/erlide-devel
>
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Erlide-devel mailing list
Erlide-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/erlide-devel
