On 13 November 2013 20:48, Frank Tkalcevic <[email protected]> wrote:
> 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? I think I read your question differently to others. You have answers about how to make and share changes with the project as a whole, but I am interpreting your question as how to keep your own private code variants separate, but up-to-date with the project. If that isn't what you are asking, then this isn't the right answer. What you can do to keep different variations separate is to keep them in separate "tracking" branches. So, if you were in "master" you could "git branch --track variant1", "git branch --track variant2" and so on. Then if you "git checkout variant1" you can make changes to the code base that are isolated in that branch, but if you "git pull" in that branch you will get any updates to the master branch (which your branch is tracking). To leave that branch and check out Variant2 you will need to commit the changes first. I very nearly always commit from git gui. (Often using the "amend last commit" checkbox. -- atp If you can't fix it, you don't own it. http://www.ifixit.com/Manifesto ------------------------------------------------------------------------------ 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
