Provide the option for Stash to perform Implicit Merges

XMLWordPrintable

    • Type: Suggestion
    • Resolution: Answered
    • None
    • Component/s: None
    • None

      Consider following situation:

      1. there are more than one pull requests concurrently waiting for merge.
      2. these pull requests could be handled by command line git with fast-forward, no conflicts at all.

      Stash's current behavior is:

      a. the first pull request could be merged
      b. all subsequent pull requests would FAILED merge
      c. annoying information dialog appear to ask 'do refresh'
      d. even no way to 'decline' the pull request before 'do refresh'

      ---------

      Stash's behavior should align with command line git to handle (no conflict) 3 way merge as handy as possible.

            Assignee:
            Unassigned
            Reporter:
            Aaron Bromberg (Inactive)
            Votes:
            1 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated:
              Resolved: