I'm reading Atlassian's excellent Git tutorials but I'm confused by one diagram:
It's the 3rd flow diagram from the top.
I think it should be just one line: D - A - B - C - E - F - G
With "Remote origin/master" pointing at C and "Local master" pointing at G.
My experiments using SmartGit (pull rebase option) and GitHub seem to confirm this answer but it seemed more likely I've misunderstood than that Atlassian have made a mistake in their diagram.
They go on say further down: "Many developers prefer rebasing over merging, since it’s like saying, 'I want to put my changes on top of what everybody else has done.'". This statement also seems to contradict the diagram.
If the diagram is right, please explain how to put local changes on top of origin changes so that origin's history is preserved.
I've raised this question on stackoverflow and a few other people also seem to think there is an error in the tutorial diagram (and the comments below it). If so how do I report the bug so Atlassian can fix if for other people reading the tutorials? Thanks.
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events