Re: [fltk.coredev] Handling merging pull requests (PR's)

GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.coredev  ]
 
Previous Message ]New Message | Reply ]Next Message ]

Re: Handling merging pull requests (PR's) Greg Ercolano 16:16 Oct 22 top right image
 
On 2020-10-22 05:51, Albrecht Schlosser wrote:

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 
linear looking:
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 fltkcoredev+unsubscribe@googlegroups.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 ]
 
bottom left image   bottom right image
Previous Message ]New Message | Reply ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2020 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.