On 11/13/13 14:03 , Robert Ellenberg wrote: > As a general rule for git, I'd suggest keeping your changes on your own > named branch. Tags are more appropriate for releases, since they always > point to a particular commit. This way, your history of the master branch > doesn't diverge from the main repository.
I agree with Robert: an ideal workflow looks like this: * Do your work on a private branch (one branch per feature, if they're independent). * Use rebase to synchronize with master (or other branches). * Use rebase to clean up your history for sharing with others. (The standard rebase caveat applies: be careful about rebasing work you've already shared with others.) * Share your code with the project by pushing to a public repo like github, or by emailing patches to the developers' mailing list (git format-patch). But! Don't let git get in the way of you contributing to the project! If you don't feel comfortable making your own branch and rebasing your work and pushing it to github (or whatever) for us to pull in, do it whatever way works for you, and we'll work with that. The only reason I'm advocating the rebase-based workflow above is that it makes it easy to iterate patches (change them based on community feedback), which often can be useful. And finally.... The Git page on our wiki is a bit chaotic, i'm working on cleaning it up and rolling it in to our standard docs, but that's not finished yet. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
