30 Apr
2011
30 Apr
'11
1:36 p.m.
Hi Reinhard,
On Sa 30 Apr 2011 12:24:42 CEST Reinhard Tartler wrote:
What command sequence would you suggest to update the content of a build-main branch (e.g. with commits from master) without conflicting with merge commits? (I certainly do want to avoid cherry-picking into the build-main branch. It shall be as simple approach...
git push origin $blessed-sha1-sum:$branch_name
Ah... cool... I will play with that on Monday...
Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...