Iโm trying to find out if the merge conflict was responsible for the error, but I have difficulties because I donโt understand how the conflict resolution affects git blame.
Say I have a file in master:
a();
b();
c();
I modify it in master:
a();
d();
c();
but also an employee, and they change it differently, in a separate branch, which they then combine to master:
a();
e();
c();
Can conflict affect guilt? In other words, if my colleague resolves the conflict by going to my version:
a();
d();
c();
and I am the git blameline d();, who will be blamed: me or my colleague?
Similarly, let's say git got confused and thought that the first and second lines are conflicting:
<<<<
a();
d();
====
a();
e();
>>>>
If my employee resolves a conflict with their version:
a();
e();
c();
git blame a();, ( ) , ( "" , ) ?