The wiki page here might answer some of your questions: http://wiki.linuxcnc.org/cgi-bin/wiki.pl?Git
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. To pull changes from the master, you start by updating the local master: git checkout master git pull 1) (The simple way / ugly way) merge the master branch into your branch directly: (after commiting all your stuff) git checkout mybranch git merge master Pros: easy to do, doesn't change history Cons: makes history look dirty in the commit log 2) Rebase your changes on top of the current master branch: First, create a "backup" name for your current branch git checkout mybranch git branch mybranch_backup Then, rebase onto the new master branch: git rebase master [-i] The -i flag is optional, and lets you squash commits together, or edit commit messages. Pros: lets you craft a cleaner, easier-to-read history Cons: Can bite you in the ass since you're rewriting history. Hope this helps, Rob On Wed, Nov 13, 2013 at 3:48 PM, Frank Tkalcevic < [email protected]> wrote: > What strategies, branching, pushing, pulling, etc do people use for > linuxcnc > development? > > > > I have 4 linuxcnc setups, all with small tweaks to the source. These can > probably be all on the same branch because the changes are independent. > Should I create a branch to keep my changes separate, or should I just make > the changes on master? Or a particular tagged version? What is involved > in pulling changes from the parent in each case? > > > > > ------------------------------------------------------------------------------ > 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 > ------------------------------------------------------------------------------ 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
