Git

Resolve git am Merge Conflicts

5 minutes to read

TL;DR: After git am encounters a merge conflict, the output of git status and the working tree’s state do not show any sign of conflict like a git pull, git merge, or git rebase conflict does, which can be very confusing. To get an experience that is at least somewhat similar to those other Git commands, use git am --reject. Problem When git am is used to apply patches and encounters a merge conflict, it will print a message like this: …

Use Git to Manage Kernel Sources on Gentoo

Updated: 12 minutes to read

Gentoo offers its users a wide array of Linux kernel packages in the sys-kernel/* category, each of which may install the kernel in a different way. In particular, the sys-kernel/*-sources packages (such as sys-kernel/gentoo-sources, sys-kernel/vanilla-sources) install only the kernel’s source code and do nothing else. This is suitable for users who prefer to compile and install the kernel on their own but still would like to let the system package manager update the kernel sources automatically. …