Answer Posted / Indu Singh

Resolving conflicts in Git can be done manually or automatically. For manual resolution, Git indicates the conflicting files with a message and marks the conflicting areas using '<<<<<<<', '=======', and '>>>>>>>'. You need to manually edit the file by merging the changes from both branches. For automatic resolution, use the command 'git merge --no-commit' followed by 'git automerge' or 'git diff --merge'. This will automatically attempt to merge the files.

How is git instaweb used?

2