See what we can take advantage of from tools people have mentioned

[epage]

I use a similar workflow and also got fed up with constantly rebasing branches so I made Autorebase to do it for me. It works really well and there were a surprising number of edge cases to handle, e.g. what happens when you run it from another worktree? What happens if the branch you want to rebase is checked out in another worktree? Etc.

It also does one fancy thing which is to quickly figure out how far it can rebase a branch before there are conflicts, and rebase it that far. Feel free to copy it!

https://www.reddit.com/r/rust/comments/p6ri06/gitstack_request_for_feedback_testers/h9gkam8/

please checkout https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html , you can make use of 'git rebase-update' command to update/sync feature branches. there are other scripts like https://github.com/git-for-windows/build-extra/blob/master/shears.sh and https://github.com/peff/git/blob/meta/rebase for more discussion you check at https://public-inbox.org/git/[email protected]/t/#m7bcc45f5705bedab5d3b76d9daa11e606b44175f . But I think you should give a try with https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html that will solve the purpose.

https://www.reddit.com/r/git/comments/c0vflc/automatically_merge_warn_in_case_of_conflict/erayxno/

[epage]

For autorebase

• https://github.com/epage/git-stack/issues/25
• https://github.com/epage/git-stack/issues/23
• https://github.com/epage/git-stack/issues/24

[epage]

For depot-tools

• https://github.com/epage/git-stack/issues/26
• https://github.com/epage/git-stack/issues/27
• https://github.com/epage/git-stack/issues/28