emacs has a script gitmerge.el, it can skip some commit when merge with different merge rule (ours), maybe can make life easier:

https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el

https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow

--
发自我的网易邮箱手机智能版