Databases
StackOverflow2013
Postsdbo
POIs it possible to use the git-flow model with Subversion?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POIs it possible to use the git-flow model with Subversion?
    primarykey
    data
    text
    <p>We use Subversion and aside from a few individuals such as myself there is little to no experience with branching and merging in Subversion. My Subversion experience is limited to simple feature branches where merge and tree-conflicts, while not exactly rare, are not exceedingly difficult to resolve.</p> <p>Given that, I am helping to manage a project where our current commit to trunk method is simply unsustainable for our needs. I introduced feature branching and merging to my localized team and we had some success. However simple feature branching was still not able to answer all our questions such as:</p> <ol> <li>How do we develop code in parallel for this release and subsequent releases?</li> <li>What code is considered stable?</li> <li>What (in development) code is going into the next release?</li> <li>What (in development) code is going into a subsequent release?</li> <li>What version of code is our Test, Acceptance, or Production environments?</li> <li>How do we integrate concurrent development activities with a known stable release to reduce introducing bugs and incomplete work?</li> <li>How do we provide hot-fixes to released code?</li> <li>How do we know, from our source control, what development activity is currently ongoing?</li> <li>How do we experiment or R&amp;D without disrupting the current code base while leveraging?</li> </ol> <p>It seems that <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">git-flow as defined here</a> would go a long way to answer a lot of these questions. I experimented with this method in Mercurial and it seems like that it is possible to implement this method there as well. Sadly, migrating to a DVCS is off the table at this point.</p> <p>However, my brief attempt to mimic this method in Subversion failed with many merge and tree conflicts. The merge options and edge cases are numerous and baffling.</p> <p>Can Subversion be used to implement <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">git-flow</a> and if so what is the pain level?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USMontag451
    1. USRyan Taylor
    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. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POIs it possible to use the git-flow model with Subversion?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POIs it possible to use the git-flow model with Subversion?
      1. USVonC
      1. VTFavorite
    3. VO
      singulars
      1. POIs it possible to use the git-flow model with Subversion?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COWhat do TEST, ACC and PROD mean?
      singulars
      1. POIs it possible to use the git-flow model with Subversion?
      1. USNihathrael
    2. CONihathrael, these refer to our three environments that we promote code through, test, acceptance, and production. I have edited to be more clear about these items.
      singulars
      1. POIs it possible to use the git-flow model with Subversion?
      1. USRyan Taylor
 

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