Jason (jcreed) wrote,

Dang, my usual git workflow is so much centered around constantly rebasing and preparing a single, clean commit (which is then exported out to the single master subversion repo) that I was totally floundering for a bit trying to figure out how to resolve a merge conflict between one bitbucket repo and another bitbucket repo upstream from it. My mistake was expecting to be able to do anything from the bitbucket web interface itself. Turns out you sit down at your local computer, git fetch from both the one-hop-upstream bitbucket repo and the two-hops-upstream bitbucket repo, merge them locally, then push the merged commit, and then bitbucket is pacified.
Tags: git

  • (no subject)

    Guy from Seattle team we've been working with showed up today at work; no matter how much I'm generally comfortable working with remote teams (and I…

  • (no subject)

    Sean's back in town --- good fun working with nonremote teammates.

  • (no subject)

    Sean's in town at work, good times.

  • Post a new comment


    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 1 comment