Skip to main content

Try to understand and explain Git rebase, merge fast-forward...

Git is a magnificent tool. Like many other DevOps tools, it save our ton of time when do software engineering.
This post I try to understand and explain some most complex feature (for me): Git rebase

I have used Git for few year, did a lot of merge, handle conflict, install and operate GitLab etc. And I also used SVN, Mercurial. But git rebase is rarely used.
  The recommendation for Dev is use Git rebase instead of merge (again it's depend) but in the most case we should use rebase.
  My understanding ab rebase is that It does the same thing as merge but it can compress, reduce or edit commit for cleaner, better history (Git log).
  And some rules ab using git rebase (some time I forgot because of less use): never rebase on public branch. But this post show one case can use it ?
https://stackoverflow.com/questions/9622131/git-rebase-merge-squash-my-feature-branch-onto-another-branch
In this post, the guy want to deploy feature_branch to master, it fit the rule "not rebase on pulic branch". But some time or by some Team/Project Git flow, we often deploy to master from dev or staging branch. So what if we rebase master when in dev branch ? It's a public branch too ?
...
  I think to understand a complex problem, in this case git rebase, merge I have to dig some deeper underlying mathematics and logic problems. To use and follow some best practice is much easier but it is time benefit. So I am going to draw some graph represent Git commit line, tree or whatever it call and try to ask some question what if and why git rebase in here ? What is the benefit of rebase ? How did it perform compress/combine commit ?
  And another questions like merge mode: fast-forward, three-way ...
When we really understanding the way a machine, tool or software work, I think we are more confidence and clear ab almost problem and situation instead of follow a mechanic guide... For example, when you have learned some mathematics course about compress algorithm and make some C program to perform it, then I'll be sure that you have a strong idea what going on inside git tracking changes...

Comments

Popular posts from this blog

AWS Elasticache Memcached connection

https://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/accessing-elasticache.html#access-from-outside-aws http://hourlyapps.blogspot.com/2010/06/examples-of-memcached-commands.html Access memcached https://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/GettingStarted.AuthorizeAccess.html Zip include hidden file https://stackoverflow.com/questions/12493206/zip-including-hidden-files phpmemcachedadmin ~ phpMyAdmin or phpPgAdmin ... telnet mycachecluster.eaogs8.0001.usw2.cache.amazonaws.com 11211 stats items stats cachedump 27 100 https://docs.aws.amazon.com/AmazonElastiCache/latest/mem-ug/VPCs.EC.html https://lzone.de/cheat-sheet/memcached VPC ID Security Group ID (sg-...) Cluster: The identifier for the cluster memcached1 Creation Time: The time (UTC) when the cluster was created January 9, 2019 at 11:47:16 AM UTC+7 Configuration Endpoint: The configuration endpoint of the cluster memcached1.ahgofe.cfg.usw1.cache.amazonaws.com:11211 St...

Notes Windows 10 Virtualbox config, PHP Storm Japanese, custom PHP, Apache build, Postgresql

 cmd => Ctrl + Shift + Enter mklink "C:\Users\HauNT\Videos\host3" "C:\Windows\System32\drivers\etc\hosts" https://www.quora.com/How-to-create-a-router-in-php https://serverfault.com/questions/225155/virtualbox-how-to-set-up-networking-so-both-host-and-guest-can-access-internet 1 NAT + 1 host only config https://unix.stackexchange.com/questions/115464/how-to-properly-set-up-2-network-interfaces-in-centos-running-in-virtualbox DEVICE=eth0 TYPE=Ethernet #BOOTPROTO=dhcp BOOTPROTO=none #IPADDR=10.9.11.246 #PREFIX=24 #GATEWAY=10.9.11.1 #IPV4_FAILURE_FATAL=yes #HWADDR=08:00:27:CC:AC:AC ONBOOT=yes NAME="System eth0" [root@localhost www]# cat /etc/sysconfig/network-scripts/ifcfg-eth1 # Advanced Micro Devices, Inc. [AMD] 79c970 [PCnet32 LANCE] DEVICE=eth1 IPADDR=192.168.56.28 <= no eff => auto like DHCP #GATEWAY=192.168.56.1 #BOOTPROTO=dhcp BOOTPROTO=static <= no eff ONBOOT=yes HWADDR=08:00:27:b4:20:10 [root@localhost www]# ...

Rocket.Chat DB schema

_raix_push_notifications avatars.chunks avatars.files instances meteor_accounts_loginServiceConfiguration meteor_oauth_pendingCredentials meteor_oauth_pendingRequestTokens migrations rocketchat__trash rocketchat_cron_history rocketchat_custom_emoji rocketchat_custom_sounds rocketchat_import rocketchat_integration_history rocketchat_integrations rocketchat_livechat_custom_field rocketchat_livechat_department rocketchat_livechat_department_agents rocketchat_livechat_external_message rocketchat_livechat_inquiry rocketchat_livechat_office_hour rocketchat_livechat_page_visited rocketchat_livechat_trigger rocketchat_message rocketchat_oauth_apps rocketchat_oembed_cache rocketchat_permissions rocketchat_raw_imports rocketchat_reports rocketchat_roles rocketchat_room rocketchat_settings rocketchat_smarsh_history rocketchat_statistics rocketchat_subscription rocketchat_uploads system.indexes users usersSessions https://rocket.chat/docs/developer-guides/sc...