Hi Milu,
your Git introductions seems to be great, but I have real issue with that "git merge" graph. When you merge, Git doesn't "flatten" the graph, only creates a new commit that will have two parents (green commit #3 and orange commit #3). Green commit 3 will never have orange commit 1 as its parent commit. If so, the green commit 3 would have different hash and the rest of the commits (orange 2 and 3) as well and you would be in same situation as with rebase.
Please, redo that graph.
Thanks.
Hi Richard,
Your comment made me realized my visualization was definitely misleading. I've updated it to reflect that a new merge commit has two parents. Thank you for the feedback!
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Hi Milu,
your Git introductions seems to be great, but I have real issue with that "git merge" graph. When you merge, Git doesn't "flatten" the graph, only creates a new commit that will have two parents (green commit #3 and orange commit #3). Green commit 3 will never have orange commit 1 as its parent commit. If so, the green commit 3 would have different hash and the rest of the commits (orange 2 and 3) as well and you would be in same situation as with rebase.
Please, redo that graph.
Thanks.
Hi Richard,
Your comment made me realized my visualization was definitely misleading. I've updated it to reflect that a new merge commit has two parents. Thank you for the feedback!