On Sun, Aug 28, 2011 at 2:23 AM, Lynn Lin <lynn.xin.lin@xxxxxxxxx> wrote: > how to get the data back to master branch? I suggest we can merge > release branch back, and others are afraid that merge conflict will be > a big deal for us so they suggest we can double commit into master and > release branch I don't see how anyone would think "double commits" would be *less* work than resolving merge conflicts. (Espically if most changes don't even conflict.) The only reason I can think of for not merging release back into master is if there are some changes on release that you don't want in master. -PJ -- 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