First I run git merge master for new code in my branch then I run the command git status which shows that I have committed many files which I didn't touch. Not sure if it happened due to using linux ubuntu. How can I solve it I have tried to git merge --abort and tried again facing the same issue.

CodePudding user response：

When a merge process has conflicts, Git asks you to solve them as you can see after git merge master. You can use a mergetool or you can solve them manually inside the code where lines have conflicts.