Today, I will use images to explain how to slove conflict while using github. There are many git or github related tutorials, but I could't find the one that suitable for me, which means none of them can make me understand. So, I asked my …