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 <prasanth@gmail.com > > wrote: > > I am facing below merge issue while using Git. Please let me know if you > have su

[git-users] Locking master branch

2017-08-30 Thread Prasanth Damodharan
In GitHub, Is there a way to lock master branch and limit access based on user ids? Thanks! -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to

[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