Re: Git merge: conflict is expected, but not detected

ame change on > two different branches and instead factor out a change needed in > multiple places into a separate branch which is then merged into the > branches that need iit. > > > On Sat, Nov 30, 2013 at 1:26 AM, Evgeniy Ivanov > wrote: >> Hi! >> >> Let

Git merge: conflict is expected, but not detected

Hi! Let's say I have two identical branches: master and topic. In master I remove some code, i.e. function bar(). In topic I do the same (commit) and after some time I realize I need bar() and revert previous commit with removal. So I end with master with no bar() and topic with bar() in its origi