Experimental Physics and Industrial Control System
Hi Dirk,
"git rebase" _moves_ a branch with a series of commits on top of another
branch. For example you can use it to rebase a branch you worked on for
a while on top of the latest version of the mainline branch before
creating a pull request. Rebasing puts the burden of resolving potential
conflicts on the contributor rather than the guy pressing the merge
button which is why Linus Torvalds implemented this feature :-)
"git cherry-pick" _copies_ a single commit to the current position in
the git history. It's a great tool for backporting a change to an older
branch without getting all the other commits.
From what you're describing cherry-picking sounds like the way to go.
You can cherry-pick from the 7.0 branch to 3.14 or the other way around.
Note that cherry-picking might fail if the code snipped the change
applies to has changed.
-Martin
--
Martin Konrad
Facility for Rare Isotope Beams
Michigan State University
640 South Shaw Lane
East Lansing, MI 48824-1321, USA
Tel. 517-908-7253
Email: konrad at frib.msu.edu
- References:
- another git question Zimoch Dirk (PSI) via Core-talk
- Navigate by Date:
- Prev:
Re: [Merge] ~dirk.zimoch/epics-base:dbChannelForDBLinks into epics-base:7.0 mdavidsaver via Core-talk
- Next:
Re: another git question Michael Davidsaver 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:
another git question Zimoch Dirk (PSI) via Core-talk
- Next:
Re: another git question Michael Davidsaver 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