SlideShare uses cookies to improve functionality and performance, and to provide you with relevant advertising. If you continue browsing the site, you agree to the use of cookies on this website. See our User Agreement and Privacy Policy.
SlideShare uses cookies to improve functionality and performance, and to provide you with relevant advertising. If you continue browsing the site, you agree to the use of cookies on this website. See our Privacy Policy and User Agreement for details.
Successfully reported this slideshow.
Activate your 14 day free trial to unlock unlimited reading.
But what if my repo
is big? 2 12,000 non-merge commits 446k lines of code added 1 3 Linux Kernel release has 15+ million LOC 4 1,339 contributors source lwn.net
merge strategy: recursive 3-way merge
but climbs the ancestry tree recursively if there are multiple ancestors M M master feature ancestor 1 ancestor 3 ancestor 2
Merge Commit Rebase (FF) Rebase
(Squash) No merge commits Verbose history Easy to read Can be more difficult to trace changes Which should I use? “Ugly” history Full traceability Hard to screw up mostly some
Can we still fix a
bug for the upcoming Release ? Is the code for that Feature complete? How do we do Hotfix for the current version? Has everyoneReviewed the code for this feature ?