workflow - Is there a conventional way to support more than one release in git? -

-

Whether a git workflow is designed to keep software from many GIT branches (for example, release.1.1 Master long time ago, and release.1.2 more recently than guru). There are great documents in the feature branch workflow, gifflow workflow, and forking workflow but I have not got information about managing more than one release.

Managing multiple releases will require the use of hotfixes and facilities for one or more Release Branches will be used to maintain all the changes for future releases, a Master branch will be used, The master's closest release can get some features and hotfix, the most release release will receive at least the update, and the Chutuli release from the Guru is the first initiative It will reach the end, life will be.

I am thinking that something like this will appear 

  Master ------- + ---------- + - --- ----- + ---------- + ------ + ----------- + ----------- --- ------ \ \ \ / \ / hotfix- + feature- + \ \ hotfix feature \ release_1.2 ------- + --------------- --- + --------------- \ hotfix release_1.1 ------------------ + --- ---- --------------- End-of-life

The following is modified to look like a ghit flow, but a 'release_1.1 'Branch.

Release_1.1 --------- + --------- + --- | \ / || Hotfix 3 | Tags 1.0 Tags 1.0.1 1.1 1.1 Tags 1.1.1 Tags 1.2 1.2.1 1.2 | | | | | | Master + ----------- + ------------- + -------- + ------------- + -------- + ------------------ | / / / / / | //// Hotfix 1 / Hotfix 2 / Hotfix Release 3 | \ + - + - + + + + + - + \ | \ / \ \ \ \ \ Evolution + - + -------- + --- + ------- + - + -------- + --- --- - ------ + ---------- + ------ \ / \ / FeatureA- + FeatureB-+

< Div class = "post-text" itemprop = "text">

You can not merge the old release based on the current master hotfix branch - this is guru In the old release too, you will have to select all the code as the basis of your hotfix branch with the common ancestor of your code, usually the point where the oldest amendment still master . From there, for each release, (1) the hotfix branch is merged into the release bracket, and then (2) merge the point where the next release was replaced by the master to the hotfix branch. And resolves conflicts. Finally, merge the hotfix branch back into master .

You may want to keep an eye on you.


Comments

Post a Comment

Popular posts from this blog

import - Python ImportError: No module named wmi -

-
I followed the instructions for downloading WMI for Python When I try to run the code for C.Win32_Service (StartMode = "Auto", state = "Stopped") import wmi c = wmi.WMI (): if Raw_input ("restart% s?"% S.Caption) .upper () == "Y": s.StartService () I got the error traceback (most recent call end): file ". \", Line 1, edit: I am using Python 2.7.6 EDIT2: I am running 64-bit Windows 2008 R2, and I've downloaded WMI-1.4.9.zip (md5). I removed the content and put it in D: Python \ Tools \ Scripts I executed dragon setup.py.install I said D : \ Python \ tools \ scripts to% PATH% and when I execute the code for C.Win32_Service (StartMode = "Auto", state = "Stopped") import wmi c = Wmi.WMI (): If raw_input ("Restart% s?"% S. Caption). () == "Y": s.StartService () error me Gets traceback (most recent call final): File ". See \", line 1, & lt; Modu...
Read more

Editing Python Class in Shell and SQLAlchemy -

-
I am working on the terminal on a shell script after this tutorial SQLAlchemy tutorial. I need to type gt; & Gt; & Gt; Sqlalchemy import column, integer, string & gt; & Gt; & Gt; Class user (base): __tablename__ = 'users' id = column (integer, primary_key = true) name = column (string) absolute name = column (string) password = column (string) def __repr __ (self): return "& lt ; User (name = '% s', absolute name = '% s', password = '% s') & gt; "% (Self.name, self.fullname, self.password) After the problem I have typed the password = column (string) I hit twice and changed .... >> I then took everything back but then an error was thrown because the class already exists ... I am not completely sure how to fix it. How do I open that slip in the shell script and edit it (Add DF to DRR) The error thrown below: / user / giripeters / TFSQLLX / Lib / python2.7 / site-packages / sqlalchemy / ext / decla...
Read more

lua - HowTo create a fuel bar -

-
I would like to create a fuel bar (empty with full tank). When the user touches the screen, the fuel once Dairejh these is my code: lifeBar = display.newImage ( "fuel_bar1.png") lifeBar.anchorX = 0 lifeboats. ======================== Lifetime Y = 37 screens Group: The Insert function (called Laifbar) However, I fuel Kansmoshn (equivalent to "pressed" variable to reduce the fuel tank "true") Have used. When pressed == is true, it means that the user is touching the screen: processed (fuel) processed () if life & gt; 0 and pressed == true remains = life - life 1 Life = life =. Wide-1 remains Value.text = string.format ("% d", life) End of this This function is active as the entrance event: runtime: addEventListener ( "Antrfrem" fuel Snsadna) it is very well, but my question is: pressed variable each time 5 seconds (once = = True) How is it possible to reduce the vitality width? I tried to add it to my touch even...
Read more