On Sun, 25 Oct 2009, David Brownell wrote: > Now, if I could only find out why nontrivial merges > with git never seem to work right for me. :(
You may have a look at 'git mergetool'. [...] > > Eventually, when OpenOCD will become a project as big as the Linux > > kernel ;-) then major developers could keep separate Git repositories of > > their own that get pulled in the main repository. But for now I think > > the above suggestion should be good enough and simple. > > Yes. Zach suggest repositories on non-SF sites for other > developers; same sort of stuff. Sure. But I still think that stuff that is in need of testers should still be published through the main repository in some side branches. Call it laziness, but I'm not that excited about having to configure an additional remote spec just to fetch the new proposed mcr/mrc stuff. If instead I get it for free along with updates to the master branch during my next 'git fetch' then I might be tempted to have a look. So I'm not entirely in agreement with Zach on that front. Asking for extra steps/efforts from potential testers doesn't usually work that well. Nicolas _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
