Add new comment

Posted on by Ivo (not verified).

Hi Katherine,

Thanks for a very informative post on this workflow. It really helped in understanding the finer details.

I've created two (python) scripts which add a 'release' and 'integrate' command to Git. It is mostly based on the fine work by Acquia but I've hopefully removed the need for hooks and sharing of the rerere cache. Instead, I've used the fact that Git is able to learn the conflict resolutions from history. This means that the script should be able to fix most (all?) conflicts by itself. The scripts and link to the accompanying blog post can be found here: https://github.com/ivov/bpf. I would love some (positive or negative) feedback if you decide to use it.

Plain text

  • No HTML tags allowed.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Lines and paragraphs break automatically.

Filtered HTML

  • Use [acphone_sales], [acphone_sales_text], [acphone_support], [acphone_international], [acphone_devcloud], [acphone_extra1] and [acphone_extra2] as placeholders for Acquia phone numbers. Add class "acquia-phones-link" to wrapper element to make number a link.
  • To post pieces of code, surround them with <code>...</code> tags. For PHP code, you can use <?php ... ?>, which will also colour it based on syntax.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <h4> <h5> <h2> <img>
  • Lines and paragraphs break automatically.
By submitting this form, you accept the Mollom privacy policy.