Feature: SC finish should try to auto resolve git conflicts in manifest merge #14
Description
Problem/Opportunity
When sc finish merges back manifest if there has been changes to the manifest since the extra branch was created there can be merge conflicts.
Proposed Solution
Sc finish should try to auto resolve these merge conflicts if possible. Which is if there is only changes to revisions, if there has been changes to more than just revisions it's impossible to auto resolve and the user should be warned they need to resolve conflicts in the manifest to continue.
Acceptance Criteria (Optional)
No response
Additional Notes (Optional)
No response