Which Git command is used to view the status of files and potential conflicts after a merge attempt?

  • git log
  • git diff
  • git status
  • git merge --status
The Git command used to view the status of files and potential conflicts after a merge attempt is git status. This command provides information about modified, untracked, and conflicted files, allowing the user to understand the current state of the repository. git log shows the commit history, git diff displays the differences between commits, and git merge --status is not a valid command for checking the status after a merge attempt.
Add your answer
Loading...

Leave a comment

Your email address will not be published. Required fields are marked *