| 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 <2017> 2018 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 <2017> 2018 2019 2020 2021 2022 2023 2024 |
| <== Date ==> | <== Thread ==> |
|---|
| Subject: | git question |
| From: | Dirk Zimoch <[email protected]> |
| To: | "[email protected]" <[email protected]> |
| Date: | Tue, 28 Nov 2017 16:54:44 +0100 |
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