git merge is frequently used during development of projects managed by git. There are many common questions about git merge and I find most are solved and discussed on StackOverflow. Here, I summarize useful ones so that others who want to learn git merge need to do the search again.
Table of Contents
Abstract Currently, the most famous process scheduling algorithm in Linux Kernel is Completely Fair Scheduling (CFS) algorithm. The core idea of CFS is to let each process share the same proportional CPU resources to run so that it is fair to each process. In this article, I will introduce how sched_min_granularity_ns and sched_latency_ns work internal…
How to transfer text messages from android phone to computer? One solution is to use the SMS Backup & Restore app. The app will backup your messages to a microSD card and then you can copy it out to a PC by connecting your Android phone to your PC with the USB cable. Read more:…
VitualBox is installed on Fedora 21 by # yum install VirtualBox The following packages are installed kmod-VirtualBox-3.18.7-200.fc21.x86_64-4.3.20-4.fc21.4.x86_64 VirtualBox-4.3.20-3.fc21.x86_64 There is the kernel modules package installed. However, when running virtualbox (after reboot), it reports: [zma@laptop:~]$ virtualbox WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (3.18.7-200.fc21.x86_64) or…
BIOS: Basic Input Output Systems UEFI: Unified Extensible Firmware Interface UEFI is the advanced BIOS, which solves some limitations in BIOS such as 1, 16-bit processor mode; 2, 1 MB addressable space and PC AT hardware. References: https://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface Read more: How to turn a BIOS-based Linux Mint 17 installation to UEFI booting? How to detect…
Is there any good multi-connection multi-part file downloading tools on Linux? wget is great but can only make 1 connection for 1 file. Sometimes, it is too slow on some networks. I use aria2 which supportsmMulti-connection download. aria2 can download a file from multiple sources/protocols and tries to utilize your maximum download bandwidth. Really speeds…
My Ubuntu boots to GUI mode by default. How to make Ubuntu Linux boot to text mode? If you are using Ubuntu older than 16 such as Ubuntu 14.04: Edit /etc/default/grub Change GRUB_CMDLINE_LINUX=… to GRUB_CMDLINE_LINUX=”text”. Backup your old grub config`$ sudo cp -n /etc/default/grub /etc/default/grub.bak-date +%s ` Update grub$ sudo update-grub If you are using…