Details

    Description

      The example shown for conflict resolution is incorrect.

      The box showing the various conflict resolution techniques and sample code -

      class LocalWinConflictResolver: ConflictResolver {
      func resolve(conflict: Conflict) -> Document? {

      class RemoteWinConflictResolver: ConflictResolver {
      func resolve(conflict: Conflict) -> Document? {

      class MergeConflictResolver: ConflictResolver {
      func resolve(conflict: Conflict) -> Document? {

      should replace ConflictResolver with ConflictResolverProtocol so for the first example we should see:

      class LocalWinConflictResolver: ConflictResolverProtocol {
      func resolve(conflict: Conflict) -> Document? {

      The remaining ones should also follow this too.

      Attachments

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

        Activity

          People

            Ian.bridge Ian Bridge
            rohinton.kazak Rohinton Kazak (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Gerrit Reviews

                There are no open Gerrit changes

                PagerDuty