RE: proper way to merge?

===Re:=== Instead of merge, I prefer to rebase. so:

git checkout dev git rebase origin rel

This replays each commit made in 'dev' on top of release, letting you fix each commit separately. It also means that when I commit to release, the changes are a nice tree. ===end===

The reason I'm doing this -- why I took over maintenance of the repository -- is because I strenuously objected to his plan to "rebase".  NO!  Merge, don't rebase.  Besides never rebasing published branches, in this case it works much better the other way around:  dev made systemic changes, and rel is mostly patches and completely new pieces of code.  After looking at what was in dev..rel and what was in rel..dev, I chose to start with dev and bring in the commits from rel in a controlled manner.

I think you are indicated that the rebase is easier because the merge is done one commit at a time rather than in one huge bang.  I want to have that advantage and then some by picking related groups of commits and verifying that it still compiles before getting more, not even limited to the original order.

I'll post what I learned in a separate note.

--John (excuse the footer; it's not my choice)

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.