On 2020-10-22 05:51, Albrecht Schlosser
I'm even having trouble getting that 'knuckle' just experimenting
with a local fork; if I rebase my branch and then merge, I end up with a
This 'knuckle' is the result of a "real" merge. This happens
"automatically" if you use `git merge' with a branch that is not
currently based on the tip of the branch you're merging into, i.e. when
your working branch (the PR branch) is based on an older commit of
master and you just merge your branch into/onto master, like this:
$ git checkout master
$ git merge feature-branch
However, if you rebased your feature branch before doing a `git merge'
then there's no need to create that 'knuckle' and git automatically does
a 'fast forward' merge, i.e. it "forwards" the master branch to the tip
of your added branch with one or more commits. This is the default and
obviously not what you want to do here.
Â Â Â Ah, OK, so I think the "--no-ff" is the secret sauce
I was missing.
Â Â Â So when I do that to my merge command, I do indeed get the
'knuckle' for my branch -- marvelous!
Â Â Â Here's the proof on my local fork using 'gitk --all', and
doing a File -> Reload after each step, my branch's commits
Â Â Â shown by the big curly brace:
Â Â Â I'll read through the rest of your comments too, but that
"--no-ff" was the big eureka for that issue.
You received this message because you are subscribed to the Google Groups "fltk.coredev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to email@example.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/fltkcoredev/1b39e3a4-69e5-e852-c744-49eb5bb3f854%40seriss.com.
[ Direct Link to Message ]