3 ms·
> When you feel you have the energy to deal with the conflict So you just kick the can down the road and end up with possibly an even more difficult conflict r
by EMM_386 1y ago
> When you feel you have the energy to deal with the conflict
So you just kick the can down the road and end up with possibly an even more difficult conflict resolution?
- BeetleB 1y ago> So you just kick the can down the road and end up with possibly an even more difficult conflict resolution? That sentiment is true for pretty much anything in life one may decide to defer till later :-) More concretely, it's often not hard to tell if deferring it will make it worse, or merely the same. The whole point of version control is to give your mind some peace in not worrying about things ("Let's make this change and we can always revert if it doesn't work out"). Conflicts are no different. There's no fundamental reason a conflict needs to be treated like an emergency.
- sunshowers 1y agoOr none at all, if you decide to abandon that work (as has happened to me a bunch).