Checkout methods now use CheckoutOptions
Merge now takes several options:
- Option to specify what is checked out for file conflicts.
- Report CheckoutProgress and CheckoutNotify
- Option to specify MergeFileFavor
Updates for code review feedback
merging branches.
This includes a refactoring of the merge logic to support the new
scenarios. New functionality includes:
- Deprecate Network.Fetchheads, Repository.MergeHeads as these should be
internal only.
- Introduce ability to pull the configured upstream branch for the current
branch
- Introduce ability to merge a branch into the current branch.
- Introduce options to control merge behavior. The current exposed options
include whether to commit the merge commit and the allowed merge types.