[git-users] Re: git merge issue

2014-02-28 Thread Thomas Ferris Nicolaisen
It's a bit hard to understand your problem here, as your terminology doesn't fit so well with how Git works. Anyhow, I'll try interpreting what you're writing into what I think you mean: On Friday, February 28, 2014 10:39:19 AM UTC+1, praveenm mulimani wrote: > > 1 .Jan_2014 - initial source w

[git-users] Re: git merge issue

2014-02-28 Thread praveenm mulimani
1 .Jan_2014 - initial source we created the Master_Branch. 2. Feb_25 we got new source & created the new empty branch Chipset_Master & pushed the latest chipset source code & created the tag -- Chipset_Tag. 3. When we merged Chipset_Tag in Master_Branch -- after merge so many conflic

[git-users] Re: git merge issue

2014-02-28 Thread Thomas Ferris Nicolaisen
On Friday, February 28, 2014 8:42:07 AM UTC+1, praveenm mulimani wrote: > > Dear All, > > > We have created git repository A.git installed gerrit 2.8.1. based on the > chipset_vendor i pushed the source to A.git repository *Master_Branch.* > So you have a Git repository called A. There's a bran