On 2/24/10 1:23 PM, Jonathan Sartin wrote: > That wa quick. > > So what's the implication for a branch that was previously tracking > 1.7. Will it now automatically track master? Do I need to take any > action? If so, what should I do? > > Not ashamed to say that I'm rather confused.
It won't track master by default, although it can be changed to do so. Try: git config -l You should see something like: branch.mybranch.remote=origin branch.mybranch.merge=refs/heads/1.7 You can change it by doing: git config branch.mybranch.merge refs/heads/master When it's time to merge your branch into the release 'cause it's finished, it should merge to master cleanly, whether it was based on master or 1.7 originally. git checkout master git merge [--squash] mybranch git push ...will do what you expect. FYI, Matt just pointed out the --squash option to me the other day. When you're ready to merge your feature branch into master, if you use the --squash option, it will turn all of your branch commits into one nice single commit. Sweet! -- Benjamin Reed The OpenNMS Group http://www.opennms.org/
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
_______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/index.php/Mailing_List_FAQ opennms-devel mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-devel
