On Thu, 18 Sep 2014 19:39:08 +0200 Tobias Klausmann <klaus...@gentoo.org> wrote:
> AIUI, we try to avoid merge conflicts, unless the merge is a > meaningful integration of divergent processes. > > However, one aspect of how ebuilds are written these days will > cause a non-trivial amount of merge commits that are not actually > useful in that sense. The concept of rebasing your commits has been invented for this. In the less common case that multiple people change the keywords, a manual three way merge is a breeze; taking into consideration that maintainers should be aware of KEYWORDS and other recent changes to their packages.
