"GOT", but the "O" is a cute, smiling sun Index

Thread:
make 'got update' skip conflicted files?