Uploaded image for project: 'Qt Cloud'
  1. Qt Cloud
  2. CLOUD-65

Document all situtions of git pull

XMLWordPrintable

    • Icon: Task Task
    • Resolution: Done
    • Icon: P3: Somewhat important P3: Somewhat important
    • None
    • None
    • Git
    • None

      We should document all different git pull situations so that our code is able to handle them.

      1. Normal Git Pull - local is behind remote - no conflicts
      2. Git pull - local is behind remote and has commits - no conflicts
        1. How to assert that the commit and pull is fast-forward?
      2. Git pull - local is behind remote and has commits - with conflicts
        1. This is a non-fast-forward commit with merge conflicts

       

      This task is only for documentation that helps us in improving our own implementations to handle such situations.

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

            johannes.heikkinen Johannes Heikkinen
            as33ms Aseem Shakuntal
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes