[git-users] Issue with exorbitant number of non-sensical conflicts following a second git rebase on branch

2014-07-04 Thread ayrshireminis
I am fairly new to the concept of rebasing with Git, and I have been following the guidance from a StackOverflow post by doing this: git fetch git checkout CRM-my-feature-br

[git-users] Re: Issue with exorbitant number of non-sensical conflicts following a second git rebase on branch

2014-07-04 Thread Matthew Johnson
I usually only 'lurk' on this forum, since I am pretty new to Git myself, too. But there are two things that stood out here I feel I need to speak up about: 1) be very, very careful about following the 'guidance' from a Stack Overflow post where neither the question nor any of the answers got a