Re: What's cooking in git.git (Apr 2026, #08)

[Phillip Wood <phillip.wood123@gmail.com>]

On 23/04/2026 11:38, Junio C Hamano wrote:
> 
> * hn/git-checkout-m-with-stash (2026-04-15) 5 commits
>   - checkout -m: autostash when switching branches
>   - checkout: rollback lock on early returns in merge_working_tree
>   - sequencer: teach autostash apply to take optional conflict marker labels
>   - sequencer: allow create_autostash to run silently
>   - stash: add --label-ours, --label-theirs, --label-base for apply
> 
>   "git checkout -m another-branch" was invented to deal with local
>   changes to paths that are different between the current and the new
>   branch, but it gave only one chance to resolve conflicts.  The command
>   was taught to create a stash to save the local changes.
> 
>   Will merge to 'next'?
>   source: <pull.2234.v14.git.git.1776270259.gitgitgadget@gmail.com>

If you can hold off for a couple of days, I'm planning to review the 
lastest round tomorrow

Thanks

Phillip