Jerin
Reputation: 737
In git the Files that I haven't changed are automatically committed
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.
Upvotes: 0
Views: 31
Answers (1)
Filippo
Reputation: 126
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.
Upvotes: 2
Related Questions
- Why Git uploads unchanged files again?
- Git pushes all files even if nothing to commit
- How can a file be changed in Git / Github without a commit
- Files stay modified in git repository
- Why does git modify my files? How do i undo it?
- Git detects changes in files when there is none
- new files appear on GitHub, but don't replace old ones
- Why git sometimes shows that a file was changed when it was not?
- How do you end up with commits that have no changed files?
- How do I stop git from committing unchanged files?