After doing a merge of 2 branches in a Delphi project I get some merge
Some I understand are clearly conflicts as they are simply adverse. But
many look like this example:
+ Button13: TButton;
+ IBCustomerISACTIVE: TIBStringField;
+ DBCheckBox5: TDBCheckBox;
+ DBCheckBox6: TDBCheckBox;
+ IBStationISACTIVE: TIBStringField;
+ IBAccountISACTIVE: TIBStringField;
+ DBCheckBox7: TDBCheckBox;
+ IBCustomerSHOWPRICE: TIBStringField;
+ DBCheckBox8: TDBCheckBox;
So my question is: what is conflicting here? Why does git not just copy the
added lines of the second branch into HEAD?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To view this discussion on the web visit
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at