The near.comp fix was merged to master on November 7, so by just doing a 'git pull' you will have the fix available.
Since git is a distributed system, you can do any of the things any other developer would do to put a change where you want it * merge origin/v2.4_branch into your branch or your master * cherry-pick the commit to your branch or your master * make the change by hand on your branch or your master and commit the result * keep changes uncommitted by using git stash around git pulls Personally, I would choose one of the two items at the top of the list. I'd either merge v2.4_branch or cherry-pick a specific commit. There's no reason to make the change by hand (unless of course you'd made it before a version of the bugfix was commited to v2.4_branch), and there's no reason not to use git's facilities for local commits to organize your own work. If you choose to merge v2.4_branch into master, then after that you will not want to use 'git pull --rebase', you'll want to use 'git pull'. That's because rebase will want to replay all of the commits from origin/v2.4_branch not otherwise merged onto master, to create a linear history. The exception to this rule is if origin/master has merged origin/v2.4_branch since you did (because then rebase can see that all those commits from origin/v2.4_branch are already on master, so it doesn't need to rebase them). You can see what rebase would like to do (and influence it) by using 'git rebase -i origin/master' (interactive rebase). Finally, there's the still more advanced approach of "integration branches". You want to run a system that's v2.4_branch + master + your own changes. Put your own changes in commits on your own branch starting from origin/master. Never merge into this branch. Then make a new branch starting at origin/master. Merge v2.4_branch and your own branch. This is called an integration branch, because you only do merges on it. When you want to make more changes, go back to your first branch, make and commit the changes, and then create a new integration branch to pull in the changes you want from other branches. I'm not entirely sure I understand how best to use integration branches, but the git manpage 'gitworkflows' promotes their use so I figure I should mention it. Jeff ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
