Re: [git-users] Having same conflicts on every merge?

2013-12-26 Thread prashanna rana
Thank you for your support and suggestions. Its a very good feature of git. Atleast we don't have to mess with so many non-related conflicts of not changed file. Thank-you again and we are going to pick cherry lol :D On Thursday, December 26, 2013 3:00:00 PM UTC+5:45, Konstantin Khomoutov wrot

Re: [git-users] Having same conflicts on every merge?

2013-12-26 Thread Konstantin Khomoutov
On Wed, 25 Dec 2013 21:28:36 -0800 (PST) prashanna rana wrote: > I've a stable released version i.e version2.0 and a master for > future version release say v3.0. > version2.0 doesnot have some features of master. when i found bug in > version2.0 then i create a branch under version2.0 say v2.0