Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-1302

A better fetch/pull/merge procedure in git

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Unresolved
    • None
    • Git
    • None
    • Mac OS X 10.8.2
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      When working with a git repo, one of the most common tasks I need to do is pull from the remote repo. Currently, in SourceTree, what often happens is:
      1. I click the "Pull" button.
      2. As the window loads, ST also goes and fetches the remote repo
      3. With the "Pull" modal dialog still up, I see the list of commits populate with the remote umerged commits.
      4. I click "OK" and ST goes all the way back to the remote repo, and pulls (another fetch and a merge,) failing if it can't fast forward. If I need to fix my commits so that a fast forward works, if I pull again, it again fetches from the remote.

      I would like to see those extra fetches done away with. Either have ST not do a remote fetch if I'm about to do a pull. Or, alternatively, de-emphasize 'pull' and instead make ST fetch as normal (that is, on a schedule or if the user presses the button to do so) and have an easy way to say "try to merge up to the latest remote commit I have locally." Right now, if I fetch and need to merge, even if it's a fast forward merge, I have to select my latest local commit, open the merge dialog, select the latest remote, and hit "OK".

              Unassigned Unassigned
              08ab1ad9dcd8 Matthew Torok
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated: