Suppose I have a feature branch and a release branch created from the master branch. I made my code changes and pushed it to the feature then merged to the release branch. Before I merge the changes to the master branch if there are new changes pushed to the master branch for one or more files I have changed in my branches, the pull request to merge into master will show a conflict issue. To resolve it and pull the changes from the master branch to the feature branch if we use git pull origin master command (or git pull origin from the other corresponding feature or release branch), the changes will be pulled but the files in the feature branch will contain additional multiple less than and greater than symbols and we need to fix those manually.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.