Accommodating

It entails giving the opposing side what it wants. 

The use of accommodation often occurs when one of the parties wishes to keep the peace or perceives the issue as minor. Employees who use accommodation as a primary conflict management strategy, however, may keep track and develop resentment.