Home / Blog

Add new comment

Posted on by Katherine Bailey.

why would you need to recreate the whole branch when a new feature is ready?

The reason for doing this is to ensure that the QA branch is completely up-to-date. Suppose there had been a hotfix since the last time it was recreated - recreating QA from scratch ensures it starts out with the latest code from master. It's also entirely possible that developers have pushed minor changes to their feature branches in the meantime (even if they're not supposed to) so this ensures the latest commits from those branches get pulled in as well.

I think the simplified version you mention could definitely work, especially if the project is not doing any continuous integration. It would mean that merging a feature into QA is potentially much more difficult because each commit could have conflicts needing to be resolved. But if the "features" are more like bugfixes as you say, they are probably only one or two commits anyway so this doesn't matter so much.

More information about text formats

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.