The answer is: They started to tolerate each other
during earliest time of their conflict, the settlers in texas and mexican government was fueled with intense cautions since they are not familiar with one another,
Overtime, they realize that the people in their cultures inherently desire and behave in similar ways with only a little of difference. Eventually they started to tolerate each other.