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)

    Some further progress cleaning up the https://xkcd.com/1360/ -esque augean stables that is my hard drive. Tomato chicken I made a couple days ago…

  • (no subject)

    Did some personal archaeology. Helped a little with laundry. Threw some chicken, onions, tomato, stock, peppers in the slow cooker and hopefully…

  • (no subject)

    Dinner with akiva and dannel at nuevo portal in carroll gardens. Ate a pile of chicken stew and rice and beans and maduros, good times. I do miss…

  • 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