Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017 Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
<== Date ==> <== Thread ==>

Subject: Re: git question
From: "Kasemir, Kay" <kasemirk@ornl.gov>
To: Dirk Zimoch <dirk.zimoch@psi.ch>, "core-talk@aps.anl.gov" <core-talk@aps.anl.gov>
Date: Tue, 28 Nov 2017 16:16:00 +0000
Hi:

Missed a key idea..

> Like this:
> 
> Create a PSI branch.
> On that branch you can do any PSI-specific changes. The PSI branch is never merged back into master.
> 
> For bugfixes, create branches like "FixBug123", "FixBug456". When done, these branches are merged


For bugfixes, create branches like "FixBug123", “FixBug456” off the master(!) branch. When done, these branches are merged


> 1) Into master
> 2) Into the PSI branch. Actually, you could either merge FixBug123 into PSI, or just merge master back into PSI which already contains the FixBug123 merge.
> 
> In case you do develop something of general interest on the PSI branch, something that should be merged into master:
> Create a "FeatureXYZ" branch off master. Cherry-pick the commits for the new something from PSI into FeatureXYZ, then merge FeatureXYZ into master.
> 
> When a new EPICS update comes out on master, you again merge master into PSI. It will keep your config file changes from the PSI branch.
> In theory, that works great. In practice, it actually works quite well, but of course there will be merge conflicts when the master branch updated the structure of a config file, so then there are changes to the file on both master and in the PSI branch which you will need to sort out.
> 
> -Kay
> 
> 
> 


References:
git question Dirk Zimoch
Re: git question Kasemir, Kay

Navigate by Date:
Prev: Re: git question Dirk Zimoch
Next: Re: git question Kasemir, Kay
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
Navigate by Thread:
Prev: Re: git question Niklas Claesson
Next: EPICS 7.0.1-pre1 (dbJLinkInit: lexical error: invalid char in json text. ) on Fedora 26 Williams Jr., Ernest L.
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
ANJ, 29 Nov 2017 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·