Search code examples
gitgit-merge

Git Tower warning sign

enter image description hereI'm trying to reverse merge the master branch into my local-branch using TOWER git client, it has some merge conflicts I have resolved that but still getting warning sign. Attaching the screenshot for better understanding.strong text

Solution

  • Normally, solving all merge conflicts with tower should lead you to make a commit.
    As described in "Solving Merge Conflicts"

    After having solved all conflicts you must commit your resolution. A suitable merge commit message is automatically prefilled for you.

    https://www.git-tower.com/help/media/pages/guides/branches-and-tags/merge-conflicts/windows/-1923132997-1588745906/conflict-step-5.png

    But if you believe you have solved everything, switch to command-line, and do a git status: you will see if there is any other files with merge conflicts there.