Experimental Physics and
Industrial Control System

Hi git experts,

How can I "replay" changes that had been made on the 3.14 branch on the 7.0 branch?

If I understand 'git rebase' correctly, it "moves" the changes (removing them from the original branch) but does not "copy" them.
Or can/should this be done with 'git cherry-pick'? (Does git rebase basically do cherry-pick + reset?)

Will git be able to handle files that have been moved to a different path?

What about the other way round? (replaying changes on the 7.0 branch on 3.14)

Dirk

Replies:

Re: another git question Konrad, Martin via Core-talk

Re: another git question Michael Davidsaver via Core-talk

Navigate by Date:

Prev: Build completed: epics-base base-integration-37 AppVeyor via Core-talk

Next: Re: [Merge] ~dirk.zimoch/epics-base:dbChannelForDBLinks into epics-base:7.0 mdavidsaver via Core-talk

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: Build completed: epics-base base-integration-37 AppVeyor via Core-talk

Next: Re: another git question Konrad, Martin via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024