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

[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

[git-users] Re: "Deleted by us" while cherry-picking a gerrit in the same project

2017-07-12 Thread Maheshwaran A N
'deleted by us' means the file is deleted in the commit which you are trying to do a cherry-pick. It is not file is deleted by you. Git tells that the file was deleted in some other commit, and allows you to decide to retain it (git add) or to remove it. You can do git cherry-pick --continue

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

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

[git-users] Re: "Deleted by us" while cherry-picking a gerrit in the same project

2017-07-12 Thread Igor Djordjevic
Hi Maheshwaran, On Wednesday, July 12, 2017 at 2:34:44 PM UTC+2, Maheshwaran A N wrote: > > 'deleted by us' means the file is deleted in the commit which you are > trying to do a cherry-pick. It is not file is deleted by you. Git tells > that the file was deleted in some other commit, and