refactored branch updater to continuously update its BranchUpdateResult field while performing the update, instead of gathering results and creating a new object in the end. Also added the code for performing a simple merge and aborting if failed, but this has not been enabled yet. I should create a new settings page and add a flag there to leave it on the user.
refactored branch updater to continuously update its BranchUpdateResult field while performing the update, instead of gathering results and creating a new object in the end.
Also added the code for performing a simple merge and aborting if failed, but this has not been enabled yet. I should create a new settings page and add a flag there to leave it on the user.

JChrist/gitextender