Hi David; Am Samstag, 25. Juni 2011, 19:41:25 schrieb davidMbrooke: > On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote: > > Hi David > > > > ok, done. 4.0.1 deleted, 4.0-fxies created. > > Please adjust your local git. You may need to delete 4.0.1 locally and > > add the tracking command for 4.0-fixes, don't know... Don't used any > > magic tricks as Andrew can do :) > > > > kp > > Hi kp, > > Like you I am not sure of all the Git magic spells yet so I deleted > everything, re-cloned the bering-uclibc repository and re-created my > tracking branch. Looks fine. I am happy with the branch name now :-)
Phew... > Where we are applying bug-fixes for 4.0.1 we also need to apply those to > the master branch so that they are included in 4.1. Unless Git has some > clever way to do that we presumably need to just make the edits > separately in each branch. Correct, so git cherry-pick might be a solution for small changes. I've read it can lead to problems if one merges later, but our intention is not to merge 4.0-fixes with master. kp ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense.. http://p.sf.net/sfu/splunk-d2d-c1 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
