The workflow I've introduced into the group is to use "topic" branches that stay floating on top of the "dev" tip by rebasing each day. A completed "topic", when it's ready for everyone to use, gets merged back onto "dev" (either merge to preserve the detailed history, or squished to be a single change). I'm quite comfortable with that, and it works well. But submodules seem to throw a spanner into the works. Perhaps it's a problem with the tools. But if a submodule has been changed, the rebasing does not go smoothly. At the very least, it stops to report a conflict. What's going on here? Is it something with the tools that doesn't like submodules that well? What should I do when this happens? What should I be doing as a general technique to prevent problems? Is there already a treatment of this somewhere on the web? Thanks, --John TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html