What Happens When a Merge Conflict Occurs in Git

question 40

Multiple Choice

What happens when a merge conflict occurs in git?

• A) The conflicting files remain unchanged in the local repository.
• B) Conflict markers are added to the files.
• C) A new branch containing the remote changes is created.
• D) The affected files are flagged as conflicting.
• E) The newest version is placed in the local repository.

---

Definitions:

Finished Goods Inventory

The stock of completed products that are ready for sale but have not yet been sold.

Work in Process

A stage in the production process where goods are partially completed and will require further work before they are ready for sale.

Costs Transferred

The expenses that are moved from one department or project to another within the same company.

Underapplied Overhead

A situation in accounting where the allocated overhead for a period is less than the actual overhead incurred.