Re: [git-users] keeping two branches with partially different history in sync

2017-05-16 Thread Michael
On 2017-05-16, at 1:36 PM, matevz.lan...@borea.si wrote: > Hi Michael, > > that would work normally, however we have a problem that we can not keep > common master and we need to split the master to A and B. The base code > changes are huge and there is no way for us to ever merge A and B

Re: [git-users] keeping two branches with partially different history in sync

2017-05-16 Thread Matevz . langus
Hi Michael, that would work normally, however we have a problem that we can not keep common master and we need to split the master to A and B. The base code changes are huge and there is no way for us to ever merge A and B branches completely. However the commits applied to A and B are

Re: [git-users] keeping two branches with partially different history in sync

2017-05-16 Thread Michael
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

[git-users] keeping two branches with partially different history in sync

2017-05-16 Thread matevz . langus
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 /

Re: [git-users] Will Git suit my needs? If so then which version/toolset?

2017-05-16 Thread Nelson Efrain A. Cruz
Hi, you are confusing git with the tools that use git. Git it's only a version control system, ie it has no authorization or authentication methods nor concepts of projcts. It only cares about versioning. Then you have tools like github (which I think you call Git Enterprise) which are builded