code: def merge_resolve(branch, fast_forward=False, commit=True, options=None):
      
      def get_resolution(resolved=None):
          return resolved
  
      with git_continuer(get_resolution):
          resolved = merge(branch, fast_forward, commit, options)
          if commit and resolved.resolved:
              # Then the resolved files were added, better commit them
              commit("Merge branch '%s' into '%s'" % (branch, current_branch()))
docs: Merge that branch into current branch
  
      If git raises an error, and the error is for conflicts
          then read the error message looking for any resolved conflicts
          Remove the resolved conflicts from the error message
      If all conflicts were resolved
          then remove the error