Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>One case I could think of, where this can make thing go complicated is that it will start blocking further development.</p> <p>Consider you are developing a feature A, which will go immediately on your next release. Now there is another development team which will be working on feature B, which is heavily dependent on feature A, but it needs to be in release only after a couple of sprints. So, obviously we will branch out feature B from feature A.</p> <p>Now, you find a bug in feature A, your release for feature A is approaching fast, you have two options a hot-fix/hack or a proper code re-factor and fix.</p> <p>With time as constraint, its wise to have hot-fix, but considering future we need proper re-factor and fix.</p> <p>Happy news is that we can go for both.</p> <p>With your strategy (from what I understand) your release branch, will receive all the patches and hot-fixes(contains 5+ commits) as you can't commit anything like that to feature A (if you are strict on policies). Consider the number of such fixes release will be having if you have 10+ features at once.</p> <p>But with Vincent Driessen's strategy there is always development branch as a stash between your feature and release, so for such hot fixes you can merge back to development branch and then branch out from there for the hot fixes and then merge back to development and then to release. And you have advantage of not having the hacks/hot-fixes anywhere in your feature branch. Further features based on the feature can continue parallel. And you can abandon the hotfixes branches or remove from history. This only one view-point and probably you can defend your strategy in this case. I am open for further discussions and corrections in my answer :)</p> <p>And here is a pretty nasty image depicting what I am conveying. <img src="https://i.stack.imgur.com/vJ6U8.jpg" alt="Git Branching Diagram"></p>
    singulars
    1. This table or related slice is empty.
    1. POWhy is merging feature branches into release branches a bad idea?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USJesly Varghese
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COCool image!!!!!
      singulars
      1. PO
      1. USslebetman
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload