Re: [git-users] Issues with wrong merge to master

2017-08-31 Thread Mattias Vannergård
It is the merge strategies "theirs" and "ours" - https://git-scm.com/docs/merge-strategies Den torsdag 31 augusti 2017 kl. 10:17:04 UTC+2 skrev Prasanth Damodharan: > > thank you! > > On Wednesday, August 30, 2017 at 2:53:47 PM UTC+5:30, Michael Gersten > wrote: >> >> >> On 2017-08-30, at 1:30

Re: [git-users] Issues with wrong merge to master

2017-08-31 Thread Prasanth Damodharan
thank you! On Wednesday, August 30, 2017 at 2:53:47 PM UTC+5:30, Michael Gersten wrote: > > > On 2017-08-30, at 1:30 AM, Prasanth Damodharan > wrote: > > I am facing below merge issue while using Git. Please let me know if you > have suggestions on how to resolve it >

Re: [git-users] Issues with wrong merge to master

2017-08-30 Thread Michael
On 2017-08-30, at 1:30 AM, Prasanth Damodharan wrote: > I am facing below merge issue while using Git. Please let me know if you have > suggestions on how to resolve it > > 1. Feature branch (DEV_FEATURE1) got merged to master branch by mistake and > changes

[git-users] Issues with wrong merge to master

2017-08-30 Thread Prasanth Damodharan
I am facing below merge issue while using Git. Please let me know if you have suggestions on how to resolve it 1. Feature branch (DEV_FEATURE1) got merged to master branch by mistake and changes were reverted from master 2. DEV_FEATURE1 has files that are not present in master. 3. After reveral