Re: [git-users] Issues with wrong merge to master
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 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 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. >> >> >> This sounds like merge's behavior of "We only look at the tips and >> changes since merge_base". You merged feature to master, deleted stuff in >> master (reverted it out of master), and now are merging master to feature, >> causing the master's changes to propagate to feature. >> >> If that's the problem, I know that there's a way to merge where you say >> "Trust everything we have, discard everything from the other guy, just >> reset merge base and ignore that code completely". But what that is, I >> don't know. >> >> >> --- >> Entertaining minecraft videos >> http://YouTube.com/keybounce >> >> -- 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.
Re: [git-users] Issues with wrong merge to master
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 > > 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. > > > This sounds like merge's behavior of "We only look at the tips and changes > since merge_base". You merged feature to master, deleted stuff in master > (reverted it out of master), and now are merging master to feature, causing > the master's changes to propagate to feature. > > If that's the problem, I know that there's a way to merge where you say > "Trust everything we have, discard everything from the other guy, just > reset merge base and ignore that code completely". But what that is, I > don't know. > > > --- > Entertaining minecraft videos > http://YouTube.com/keybounce > > -- 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.
Re: [git-users] Issues with wrong merge to master
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 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. This sounds like merge's behavior of "We only look at the tips and changes since merge_base". You merged feature to master, deleted stuff in master (reverted it out of master), and now are merging master to feature, causing the master's changes to propagate to feature. If that's the problem, I know that there's a way to merge where you say "Trust everything we have, discard everything from the other guy, just reset merge base and ignore that code completely". But what that is, I don't know. --- Entertaining minecraft videos http://YouTube.com/keybounce -- 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.
