D M German [d...@uvic.ca] wrote: > > > Leo> In terms of the optimal git workflow, if I understand correctly, > Leo> Github recommends forking the project (and then sending pull > Leo> requests). One minor drawback of this approach is that forked > Leo> branches don't show up in search on github. It is also possible to > Leo> clone the existing project, create a /new/ github project and push to > Leo> it -- but I'm guessing that would make it impossible to submit a pull > Leo> request to the upstream repository (DMG or anyone more knowledgeable > Leo> -- please correct me if I'm wrong on this). > > I agree with Leo that we need to look at potential workflows. The main > challenge, as we speak, is that it is very difficult to integrate work > across our branches.
I have been using github for the past few weeks to contribute to the IPython project. It's all new to me, and any RCS system takes some getting used to, but I'm impressed with it so far. I'm even putting my non-public work (academic papers, etc) into git to more easily manage it. (Something I've been toying with doing for many, many years) Git has "light-weight branching" which encourages people to branch early and often. Contributors fork the main repository and create as many branches as they desire for different ideas/patches/work, and can submit a 'pull request' to the main branch. The maintainer can then view the changes, comment on them (even line-by-line comments) and pull them if desired. In order to merge changes from another branch, one must track the other. So there should be a master repository, and contributors must periodically pull patches from it to keep up-to-date. It sounds like this could be something synced to Denis' CVS? It's also possible to merge patches from parallel (rather than tree-like) branches, if they don't conflict. But a hierarchical structure with an absolute "master" is probably easiest. Cheers, Bob McElrath (who is waiting, in frustration, for tablet computers usable with xournal to re-appear on the market -- suggestions welcome) ------------------------------------------------------------------------------ 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/ _______________________________________________ Xournal-devel mailing list Xournal-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xournal-devel
