Nice video, this is happy path that different files are added in different branches. Can you please consider complex scenario, where same files modified in different branches. Then my branch have lots of commits and merges then how to squash those into one.
Indeed. I'm guilty of 'happy path' programming here. Just trying to make it simple for new users. I'll see if I can come up with a more complicated scenario that reflects the real world the next time I put together a recording.
Impressive Sir. I have got huge respect for teaching skills.
Thank you for this video and especially for example-repo on gitlab!
Your narrating voice is really good , reminds me of Mercedes TV ads and Nat Geo shows
awesome explanation, thanks for sharing
Glad I could be of service.
It's a pretty advanced topic, so if you understood it, you're pretty clever yourself.
Nice video, this is happy path that different files are added in different branches. Can you please consider complex scenario, where same files modified in different branches. Then my branch have lots of commits and merges then how to squash those into one.
Indeed. I'm guilty of 'happy path' programming here. Just trying to make it simple for new users. I'll see if I can come up with a more complicated scenario that reflects the real world the next time I put together a recording.
Isn't there a git merge squash?
I didn't want to show off.
Why don't you just use git merge --squash? This is much faster and easier