Branch: refs/heads/blead
Home: https://github.com/Perl/perl5
Commit: 07a33394e5cc78cd37dc463e956c693aa331b1b1
https://github.com/Perl/perl5/commit/07a33394e5cc78cd37dc463e956c693aa331b1b1
Author: Bram <perl...@wizbit.be>
Date: 2022-08-11 (Thu, 11 Aug 2022)
Changed paths:
M pod/perlgit.pod
Log Message:
-----------
Add what-to-do when push after merge fails
After merging a branch with a merge-commit (i.e. `git merge --no-ff`) then
one must be careful when using `git rebase` (or `git pull --rebase`).
The rebase (by default) will throw away the merge commit which is not
what you wanted if the merge-commit was intentional.
For those cases `git rebase --rebase-merges` can/should be used.
(Or `git rebase --preserve-merges` for older git versions.)
