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 when master is merged back to DEV_FEATURE1, all files that are not present in master is getting deleted and many files are conflicted. Please let me know if you have faced similar issue and how to get master back to normal. -- 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+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
