After you watch a merge dedicate inside the output of git log, you will note its mother and father mentioned at stake that begins with Merge: (the 2nd line In such cases):Then, based on the end result, your program can just continue to keep working from there or you can code to stop it if you want.DaedalusDaedalus 41644 silver badges1818 bronze bad