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

2017-07-13 Thread Igor Djordjevic
Git for human beings > *Sent:* Thursday, July 13, 2017 8:58 PM > *Subject:* 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 20

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

2017-07-13 Thread Philip Oakley
From: Igor Djordjevic To: Git for human beings Sent: Thursday, July 13, 2017 8:58 PM Subject: 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

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

2017-07-13 Thread Igor Djordjevic
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

2017-07-12 Thread Maheshwaran A N
Requirement is to keep all the changes of INT. When you have multiple files to solve the conflicts and you very well know which branch to retain, then why not use ours/theirs? Whats dangerous here? User is very clear on what needs to be retained. Also, if you retain INT content, there is no

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

2017-07-12 Thread Igor Djordjevic
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 >: > > On Tuesday, 11 July 2017 07:36:47 UTC+5:30, Anjaiah Yamagani wrote: > >> > >> Hi Team, > >> > >> I have very quick question - as I'm new to the git

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

2017-07-12 Thread Yubin Ruan
2017-07-12 20:40 GMT+08:00 Maheshwaran A N : > I suppose you are trying to execute the below commands. > > git checkout master > git merge origin/INT (taking changes from remote branch) or git merge INT > (merge with local changes) > At this point you would have faced the

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

2017-07-12 Thread Maheshwaran A N
I suppose you are trying to execute the below commands. git checkout master git merge origin/INT (taking changes from remote branch) or git merge INT (merge with local changes) At this point you would have faced the conflicts. In this case, if you want to retain the changes of INT, you can