Is There a Conflict in a Git Commit?

i don't know exactly how the conflicts would pan out in that case. i ud be like trying to merge in two different branches at that point. If you didn't take the same git commit path to get there, you ent up having problems om conflicts with get. Aand we lost allan cause the 19 eightyis called,. so, yes, i don't know if they heard that, youafte e listener heard that, but, yo, the eighties called, i think ado brown needed some help, right? Marty was like, altus an platonium and n his kill were acting like jerks  - just to be clear. Eonenin that