Re: what's the strategy for code sync between branches e.g. scala-2.10 v.s. master?

2013-11-04 Thread Mark Hamstra
Rebasing changes the SHAs, which isn't a good idea in a public and heavily-used repository. On Mon, Nov 4, 2013 at 1:04 AM, Liu, Raymond wrote: > Hi > It seems to me that dev branches are sync with master by keep > merging trunk codes. E.g. scala-2.10 branches continuously merge latest

what's the strategy for code sync between branches e.g. scala-2.10 v.s. master?

2013-11-04 Thread Liu, Raymond
Hi It seems to me that dev branches are sync with master by keep merging trunk codes. E.g. scala-2.10 branches continuously merge latest master code into itself for update. While I am wondering, what's the general guide line on doing this? It seems to me that not every code in m