After a lengthy debate where two colleagues shared the pros and cons of their respective solutions, one colleague decided the resolution was taking too long and so conceded. This conflict was resolved through

The conflict was resolved through accomodation

Explanation: The accommodating method is one of sacrifice, selflessness and low assertiveness. You are willing to give up just about everything in order to preserve the relationship with the other party.

Accommodation.

Accommodation sacrifices one's own goals for the sake of the other person.

Accommodators often use phrases like: "Whatever you want is fine with me." When one party in a conflict genuinely does not care about the outcome of the conflict, accommodation may be the right choice for that situation.

answer; engram;