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

Git pull fails when the branches have diverged (non-fast-forward)

    XMLWordPrintable

Details

    • Task
    • Resolution: Done
    • P2: Important
    • None
    • None
    • Backend , Git
    • None

    Description

      Example repo state: 

      * ad7eb4a (HEAD -> aseems-qtgitlab) Fetch remote updates first
| * da68571 (qt_origin/aseems) Update universal-test-file
|/
* e88b616 Pull happens from remote to local
* aa78835 Update universal-test-file

      At this point, if we try to do `git pull -v qt_origin aseems:aseems-qtgitlab` this fails because it's a non-fast-forward situation.

      Attachments

        Activity

          People

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

            Dates

              Created:
              Updated:
              Resolved: