---------
# temporarily switch to master
git checkout master
# update master to fetch the commit to be backported
git fetch --all --prune
# Note: only needed if you have your fork as "origin" (see above)
# update local repo
## NO git pull origin releasebranch_7_6 --rebase
# merge updates into local master
git merge upstream/releasebranch_7_6
# at this point we have reached:
# (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)
# ??? update own remote
git push origin releasebranch_7_6
# ??? With git log, identify the sha1sum of the commit you want to backport
(example: backport into releasebranch_7_6)
git log
# switch to branch
git checkout releasebranch_7_6
# now backport the commit (edit conflicts if needed)
git cherry-pick the_sha1_sum
# verify
git show
# push backport to upstream
git push upstream releasebranch_7_6
--------
are all these steps needed for backporting a single commit like pull/53?
(assumming that we are in releasebranch_7_6 branch)
git fetch --all
git rebase upstream/releasebranch_7_6
git cherry-pick hash
(or
git cherry-pick -m1 hash
when cherry picking a merge request
)
git push upstream releasebranch_7_6
Ma
út 16. 7. 2019 v 10:13 odesílatel Helmut Kudrnovsky <hellik@web.de> napsal:
---------
# temporarily switch to master
git checkout master
# update master to fetch the commit to be backported
git fetch --all --prune
# Note: only needed if you have your fork as "origin" (see above)
# update local repo
## NO git pull origin releasebranch_7_6 --rebase
# merge updates into local master
git merge upstream/releasebranch_7_6
# at this point we have reached:
# (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)
# ??? update own remote
git push origin releasebranch_7_6
# ??? With git log, identify the sha1sum of the commit you want to backport
(example: backport into releasebranch_7_6)
git log
# switch to branch
git checkout releasebranch_7_6
# now backport the commit (edit conflicts if needed)
git cherry-pick the_sha1_sum
# verify
git show
# push backport to upstream
git push upstream releasebranch_7_6
--------
are all these steps needed for backporting a single commit like pull/53?
On Tue, Jul 16, 2019 at 12:05 PM Martin Landa <landa.martin@gmail.com> wrote:
Hi,
I am using simplified workflow:
(assumming that we are in releasebranch_7_6 branch)
git fetch --all
git rebase upstream/releasebranch_7_6
git cherry-pick hash
(or
git cherry-pick -m1 hash
when cherry picking a merge request
)
git push upstream releasebranch_7_6