Uploaded image for project: 'Qt Creator'
  1. Qt Creator
  2. QTCREATORBUG-7031

Pull with rebase does not work if file has been changed

XMLWordPrintable

    • 93e51c186a705ae7d06ebcc2e56bbda36bca9ae0

      1. Prepare a project which is checked into git on a tracking branch.
      2. Open Creator.
      3. Make sure that "Pull with rebase" is checked in "Tools" -> "Options" -> "Version Control" -> "Git".
      4. Open the project from step 1.
      5. Open a file of the project.
      6. Make some changes and save them. Do not commit.
      7. Select "Tools" -> "Git" -> "Pull" from the menu.
        Creator will ask "Would you like to stash your changes?"
      8. Click "No".
        Pull operation will fail with the following output in "Version Control" tab:
        19:15 Executing in /home/rob/dev/creator: /usr/bin/git status -s -b
        
        19:15 Executing in /home/rob/dev/creator: /usr/bin/git pull --rebase
        Cannot pull with rebase: You have unstaged changes.
        Please commit or stash them.
        The command '/usr/bin/git' terminated with exit code 1.
        The command 'git pull --rebase' failed, aborting rebase.
        
        19:15 Executing in /home/rob/dev/creator: /usr/bin/git rebase --abort
        No rebase in progress?
        

      Instead, after clicking "No", Creator should abandon the uncommitted changes and then pull, like the following commands do:

      git checkout .
      git pull --rebase
      

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

            orgads Orgad Shaneh
            rlohning Robert Löhning
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes