Multiple related tickets in Code Review (cr)
As Developer I worked on tix #1 pushed to remote repo. Code Reviewer merged tix to master branch.
As Developer I worked on tix #2 which is related tix #2. Before working on tix #2 I ran git merge –no-ff dev and it returned Already up-to-date. I saw that one of the files from tix#1 did not have the changes to a few lines. So I added the same changes to that file while working on tix #2. Then I pushed to remote repo. Code Reviewer informs me that this caused a merge conflict. CR says I should have pulled before working on tix#2.
I was told to merge master into the feature branch before working on the feature branch. Would git pull in the feature branch the right thing to do? What happens when you git pull in a feature branch?
Inquisitive Minds Need To Know