build failure : error: could not revert 27c0b997f0e... win32u: Move menu handle management from user32.

[Xephobia]

build log :

[(17:40:40)xeph:~/wine-tkg-git/wine-tkg-git]makepkg -si
  ->
  ->        .---.`               `.---.
  ->     `/syhhhyso-           -osyhhhys/`
  ->    .syNMdhNNhss/``.---.``/sshNNhdMNys.
  ->    +sdMh.`+MNsssssssssssssssNM+`.hMds+
  ->    :syNNdhNNhssssssssssssssshNNhdNNys:
  ->     /ssyhhhysssssssssssssssssyhhhyss/
  ->     .ossssssssssssssssssssssssssssso.
  ->    :sssssssssssssssssssssssssssssssss:
  ->   /sssssssssssssssssssssssssssssssssss/
  ->  :sssssssssssssoosssssssoosssssssssssss:
  ->  osssssssssssssoosssssssoossssssssssssso
  ->  osssssssssssyyyyhhhhhhhyyyyssssssssssso
  ->  /yyyyyyhhdmmmmNNNNNNNNNNNmmmmdhhyyyyyy/
  ->   smmmNNNNNNNNNNNNNNNNNNNNNNNNNNNNNmmms
  ->    /dNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNd/
  ->     `:sdNNNNNNNNNNNNNNNNNNNNNNNNNds:`
  ->        `-+shdNNNNNNNNNNNNNNNdhs+-`
  ->              `.-:///////:-.`
  ->
  -> #################################################################
  ->
  -> You can configure your wine build flavour (right now for example)
  -> by editing the customization.cfg file next to this PKGBUILD,
  -> or by creating a custom config, for example
  -> ~/.config/frogminer/wine-tkg.cfg (path set in config file)
  -> to override some or all of its values.
  ->
  -> Current path is '/home/xeph/wine-tkg-git/wine-tkg-git'
  ->
  -> If you are rebuilding using the same configuration, you may want
  -> to delete/move previously built package if in the same dir.
  ->
  -> ###################################TkG##########was##########here
When you are ready, press enter to continue.
  -> Using staging patchset
  -> Using fsync patchset
  -> Using pba patchset
  ->
  -> ccache was found and will be used
==> Making package: wine-tkg-staging-fsync-git 0-327 (Mon 11 Apr 2022 17:40:43 CEST)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Updating wine-mirror-git git repo...
Fetching origin
  -> Updating wine-staging-git git repo...
Fetching origin
  -> Found 30-win32-aliases.conf
  -> Found wine-binfmt.conf
==> Validating source files with md5sums...
    wine-mirror-git ... Skipped
    wine-staging-git ... Skipped
    30-win32-aliases.conf ... Passed
    wine-binfmt.conf ... Passed
==> Extracting sources...
  -> Creating working copy of wine-mirror-git git repo...
Switched to and reset branch 'makepkg'
warning: cancelling a revert in progress
  -> Creating working copy of wine-staging-git git repo...
Reset branch 'makepkg'
==> Starting prepare()...
  ->
==> WARNING: ! Staging has disabled mfplat support on this revision, so video playback will not work in games using mfplat unless a hotfix is available !
==> WARNING: Disabling the roblox_fix community patch because the patch is already in the Wine version selected.
  -> Changing wine HEAD to the wine-staging base commit...
Note: switching to 'a4e4e19fe0f15b0b9bf67273bb1b27e97474b606'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at a4e4e19fe0f Release 7.6.
  -> Using '/home/xeph/community-patches' as community-patches repo root
  -> Updating community-patches repo...
From https://github.com/Frogging-Family/community-patches
 * branch            master     -> FETCH_HEAD
Already up to date.
==> WARNING: Hotfix: Fix for Riot Client updates
==> WARNING: Hotfix: Bcrypt fixes for RDR2
==> WARNING: Hotfix: Protonify staging syscall emu
==> WARNING: Hotfix: Remove a TRACE in the DXGIGetDebugInterface1 stub causing segfaults.
  -> Hotfixing...
error: could not revert 27c0b997f0e... win32u: Move menu handle management from user32.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
==> ERROR: Patch application has failed. The error was logged to /home/xeph/wine-tkg-git/wine-tkg-git/prepare.log for your convenience.
  -> To use the last known good mainline version, please set _plain_version="" in your .cfg
  -> To use the last known good staging version, please set _staging_version="" in your .cfg (requires _use_staging="true")
==> ERROR: A failure occurred in prepare().
    Aborting...
  -> Removed BIG_UGLY_FROGMINER - Ribbit
  -> Removed Proton-tkg token - Valve Ribbit
  -> exit cleanup done

prepare.log

[Tk-Glitch]

Looking at your prepare.log it's clear you're not using the latest version of the repo.

[Xephobia]

with a fresh clone, it builds. Closing.