> So when the code is ready, the feature branch including any accumulated commits (history) will > get merged - and not a clean diff against the main repo?
I'm very far from being a git expert. In fact, I'm kind of the opposite - git and I have a stormy relationship and everyone has to tell me what to do. But, I believe this is what git rebase is mainly used for. You can rebase your branch against an updated master and (I'm guessing) make your changes look like a single diff. Some people don't like that as it changes history, others do like it and say yes, that's the point - clean up the history so the commit log isn't full of tiny changes that were all made in order to effect some change (i.e., address a given ticket/issue). I'm REALLY far from being a git pro, so someone else should confirm/correct this. Terry On Tue, Jun 4, 2013 at 9:43 PM, Tobias Oberstein < tobias.oberst...@tavendo.de> wrote: > Terry, > > thanks alot for your detailed explanation of a workflow. For me, that > sounds reasonable and workable. > > >At some point everyone who's interested will have contributed to the > discussion, to the code, and signed off. Then you merge it, using the web > UI > > So when the code is ready, the feature branch including any accumulated > commits (history) will get merged - and not a clean diff against the main > repo? > > Just asking .. guess there are arguments for both approaches. > > >One point of difference that I don't know the best answer to: We tend to > each have our own fork of a repo, and to send pull requests into the repo > "owned" by the organization. Others (including Github >themselves) just > have one repo and anyone can make a branch in that repo and propose it for > merging into the master of the same repo. I think I prefer the former, > though it has a little more overhead and it >requires people to do a git > remote add g...@github.com:name/project.git for the other people whose > changes you want to track and pull in etc (via git remote update --prune). > > +1 for the former (each has it's own repo). p2p scm. > > /Tobias > > _______________________________________________ > Twisted-Python mailing list > Twisted-Python@twistedmatrix.com > http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python >
_______________________________________________ Twisted-Python mailing list Twisted-Python@twistedmatrix.com http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python
