Description
Thanks for creating the nice pictures. I have looked at them and they're helpful - except for one case, where I'm sure that the information is incorrect.
Considering this explanation for git push
I see, that the left example does not fit with my experience and understanding of Git - and reproducing the setup with a small repository I get push rejected for the final git push -u origin tabby instead of a successful push.
This makes sense, because the tabby branch has different histories locally vs. remote. Locally, tabby has cat -> cat with bow tie -> cat with bow tie and stripes. Remotely, before the push, origin/tabby is cat -> cat with stripes. The last cat with stripes commit never existed locally, hence the push will not work. Merges are only possible locally and not on remote.
Do be correct, the lower drawing needs to:
- have the
was origin/tabbytext point tocat with bow tie - draw a line from
cat with bow tieto the newcat with bow tie and stripes - remove the
cat with stripesentirely and all of it's lines
What do you think?
Activity