Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

On Thursday, July 13, 2017 at 6:13:44 AM UTC+2, Maheshwaran A N wrote: > > On Thursday, 13 July 2017 03:27:06 UTC+5:30, Igor Djordjevic wrote: >> >> On Wednesday, July 12, 2017 at 6:38:35 PM UTC+2, Yubin Ruan wrote: >>> >>> 2017-07-12 20:40 GMT+08:00 Maheshwaran A N : >>> >> >

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

On Thursday, July 13, 2017 at 10:54:38 PM UTC+2, Philip Oakley wrote: > I just want to comment on Buga's > > It`s not about what you retain, but what you drop -- with "checkout > --ours/theirs", you effectively drop all the changes from one of the > branches, and I didn`t get the impression

Re: [git-users] Re: How to avoid merge conflicts while merging INT changes into Master

I just want to comment on Buga's > It`s not about what you retain, but what you drop -- with "checkout > --ours/theirs", you effectively drop all the changes from one of the > branches, and I didn`t get the impression that`s what the user wanted, as he > never mentioned that. statement. The