On Mon, 1 Mar 2021 22:54:45 -0500 Matt Turner <matts...@gentoo.org> wrote:
> tl;dr: In app-portage/gentoolkit-0.5.1 there's a new tool I wrote, > called merge-driver-ekeyword that can automatically resolve git merge > conflicts involving the KEYWORDS=... line in ebuilds. > > To use the merge driver, configure your gentoo.git as such: > > gentoo.git/.git/config: > > [merge "keywords"] > name = KEYWORDS merge driver > driver = merge-driver-ekeyword %O %A %B %P > > gentoo.git/.git/info/attributes: > > *.ebuild merge=keywords > > With that configured, git merge conflicts on the KEYWORDS=... line will > be resolved automatically (e.g. during git pull --rebase). > Excellent, this will eliminate one source of annoyance with our workflow. Perhaps we should document this in the wiki: https://wiki.gentoo.org/wiki/Gentoo_git_workflow That way new developers, or developers setting up a new machine will have instructions on setting this up.
