Tobias Klausmann: >>> >>> If this should really turn out to be a problem, then we could also: >>> >>> 4) Replace git's default merge driver by our own one that is better >>> suited for ebuilds. This can be done per repository via .git/config >>> and .gitattributes. >>> >> >> Certainly that would be even more helpful! > > Still, all of these scenarios cause merge commits
No. 1. git pull --rebase=preserve origin master => error: could not apply <commit>... <commit-msg> 2. fix conflicts via 'git mergetool' (e.g. meld or vimdiff with 3 panel view... very easy to see what happened) 3. finish rebase via 'git rebase --continue' => your unpushed keyword commit has been rewritten without a merge commit 4. push That is pretty easy and takes you ~20s for a keyword merge. What's the problem?
