Databases
StackOverflow2013
Postsdbo
POHow to handle dependencies when using git topic branch workflow?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow to handle dependencies when using git topic branch workflow?
    primarykey
    data
    text
    <p>In our project we try to stay close to the "official" git workflow as it is suggested here: <a href="http://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html" rel="noreferrer">http://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html</a></p> <p>We use a <code>master</code> and <code>next</code> branch, start our topic branches off from <code>master</code>, regularly do test integration into <code>next</code>, and if a branch is complete, we merge it into <code>master</code>.</p> <p>Now sometimes it happens, that there's some development on <code>topic-X</code>. A developer creates <code>somefile.c</code> and adds code there that he needs for his topic. After a while another developer works on <code>topic-Y</code> and finds out, that he also needs to create <code>somefile.c</code> and even would need some parts of that file from <code>topic-X</code> - but not the complete file, as it also contains code, which is only related to <code>topic-X</code>. He may also have to add other code to that file.</p> <p>If <code>topic-X</code> would be complete and merged into <code>master</code>, it would be easy: We could rebase <code>topic-Y</code> to <code>master</code> to make that code available. But what, if both topics are still incomplete?</p> <p>Because <code>topic-X</code> and <code>topic-Y</code> are really unrelated, except for this minor shared code in <code>somefile.c</code>, how can we avoid to merge them into each other and still provide both developers with the shared parts from <code>somefile.c</code>?</p> <p>If we create a fresh copy of <code>somefile.c</code> in <code>topic-Y</code> with only the relevant parts, we found that we get merge conflicts later, when we do test integration in <code>next</code>. Is there any alternative?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USMichael Härtl
    plurals
    1. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow to handle dependencies when using git topic branch workflow?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POHow to handle dependencies when using git topic branch workflow?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow to handle dependencies when using git topic branch workflow?
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

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