I have seen comments in the thread on explicit sync saying that people have applied the patches to get explicit sync for wayland working on their system. I have looked around but haven’t been able to figure it out.
Can someone offer a tutorial on how to do it?
Apparently these three patches are needed (from this link: https://forums.developer.nvidia.com/t/feature-g-sync-freesync-under-wayland-session/220822/75)
Xserver/Xwayland https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/967
Xorg protocols https://github.com/rwiggins/xorgproto/tree/explicit-sync
Wayland explicit sync protocol https://gitlab.freedesktop.org/emersion/wayland-protocols/-/tree/linux-explicit-sync-v2
what is a merge conflict and how do they resolve it manually.
It means that the code in the patch doesn’t apply cleanly to the current version of the code the patch is for. So they will have to adjust the code in the patch to make it apply with no errors.
When you start working on a code branch you’re basically taking a snapshot of the code repository as it exists at that moment.
If someone else changes the same files between the time they started working on their branch and the time they submitted the merge request it creates a merge conflict.
The code can still be reviewed by other maintainers for correctness, but in order to actually merge they will “rebase” their changes so they can apply to current code.