Phase test 3

Question 1

What happens when you add a file unmodified since the last commit?

Answer 1

Nothing - the file is not added to the staged area as there would be no changes to save.

Question 2

Which term is used when you attempt to merge two branches but are unable to because the same line of text is different in each.

Answer 2

Merge Conflict