Pull requests

#5 Open
ArneBab ArneBab
atlassian atlassian

Answered the questions. From hg.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

git checkout master
git remote add ArneBab/10-year-anniversary-raffle https://bitbucket.org/ArneBab/10-year-anniversary-raffle.git
git fetch ArneBab/10-year-anniversary-raffle
git merge --no-ff -m 'Merged in ArneBab/10-year-anniversary-raffle (pull request #5)' remotes/ArneBab/10-year-anniversary-raffle/master
  1. Arne Babenhauserheide

Why git for the Raffle? Hg-git did it cleanly, but why use git for that in the first place? Alienating the core userbase can’t be the answer, I think…

Comments (4)

  1. Arne Babenhauserheide author

    About the T-Shirt: I would not wear it as long as I cannot get all sources under a GPL compatible license, so just give it to the next one in line :)

    Yes, it would feel good to have it, but since I would not wear it, that would be wasted money for you.

      1. Arne Babenhauserheide author

        gladly :)

        and it’s not that I would not take a T-Shirt. It’s just that I think it would be wasted money for *you*, since I would not wear it… So before you throw it away, better send it - but if someone else could get it instead, look for your own success. Even though I would not wear the T-Shirt, I want BitBucket to succeed. After all I use it for hosting most of my repos, so I have a stake in seeing you succeed ;)