Let me see if I understand this correctly. You want two things that differ from a common master by a few private commits, such as Master = A, B, C, D, I, J, K, L, M
branch A = E, H, plus master branch B = F, G, plus master Did I understand that correctly? If so, I think that either doing merges from master to A and B, or rebasing the few commits of A and B to the tip of master as you go, is the right answer. Am I correct in thinking that A and B are per-client customizations to your main code? On 2017-05-16, at 7:56 AM, matevz.lan...@borea.si wrote: > Hi, > > does anybody know how to keep 2 branches synced, each of them having 2 > specific/private commits, which must not be pushed to the second branch. They > have common history and common future. > > I want to have something like this: > > branch A: E--H--I--J--K----------M > / \ \ \ / > master: A--B--C--D \ \ \ / > \ \ \ \ / > branch B: F--G------I--J--K--L > > At any point in the future I would like to use regular "git merge A" and "git > merge B" to sync and B without loosing E,H and F,G respectively. > > This could be done by using orphaned branches A and B, but then I loose > common history which I also need to keep. > > Any ideas? > > thanks, > Matevz > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
