Experimental Physics and Industrial Control System
|
Can I do the following in git?
Clone the EPICS 7 repo, create a PSI branch, do PSI specific changes
(new and modified config files), do general bugfixes,
and then merge the bugfixes back into the master branch (or create a
merge request)
*without merging the PSI specific files/changes*?
So is there something like .gitignore but only for merging?
I would also like to be able to merge changes on the master branch into
the PSI branch without deleting the PSI specific files.
Dirk
- Replies:
- Re: git question Kasemir, Kay
- Navigate by Date:
- Prev:
Re: EPICS 7.0.1-pre1 -- vxWorks 6.2 Dirk Zimoch
- Next:
Re: EPICS 7.0.1-pre1 (non-virtual destructors) Michael Davidsaver
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
<2017>
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
EPICS 7 not handling configuration errors 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>
2018
2019
2020
2021
2022
2023
2024
|
ANJ, 21 Dec 2017 |
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·
·
Search
·
EPICS V4
·
IRMIS
·
Talk
·
Bugs
·
Documents
·
Links
·
Licensing
·
|