I'd like to keep it simple -- many people using the project are going
to be new to git. Github keeps it pretty simple and provides some
nice tools for both contributors and maintainers. Namely, if I trust
you, I can just merge your code over the web, and I know I can back it
out later if needed. It also provides tools for communicating about a
pull request if you dont' want to apply it directly, asking questions,
etc.
As I'd like to be fighting version control as little as possible, I
think we should try this out and see how it fares.
--Michael
On Sat, Nov 26, 2011 at 6:17 PM, James Cammarata <jimi(a)sngx.net> wrote:
On Sat, Nov 26, 2011 at 1:01 PM, Michael DeHaan
<michael.dehaan(a)gmail.com> wrote:
> See here: https://github.com/cobbler/cobbler/wiki/Patch-process
>
> (It could probably use some updating to include a little better
> guidance for people newer to github, contributions welcome.)
>
> Basics -- everyone should get a
github.com account, fork the project,
> and create a new branch for each feature, and use pull requests to ask
> that their code get merged back in.
>
> An upside to this is that it makes it possible to watch features
> better as everyone works on them. Also, having a lot of forks of
> cobbler on github is hopefully good for spreading interest, since
> github is quasi-social.
> It also allows folks to collaborate together on a large feature before
> merging it into master -- we might even have officially hosted
> integration branches should we take on some really big things, who
> knows.
>
> Emailing this list with the pull request + an explanation is still
> encouraged and is something everyone should do, that way others can
> see what's going on and talk about it. Though we may ask a few
> questions on the pull request
> itself in github before something gets committed as well. Explaining
> how something has been tested in the pull request is a very good idea
> too.
>
> Also "following" the cobbler project on github probably can't hurt
either.
A while back, I proposed using this model:
http://nvie.com/posts/a-successful-git-branching-model/
I think that covers a lot of what you discuss above, just doing it
through github instead of sending in patches. Mainly I really like the
--no-ff option, which merges things in as a single commit instead of
pulling in a chain of commits. Thoughts?
_______________________________________________
cobbler-devel mailing list
cobbler-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/cobbler-devel