181–184 of 184 posts
Earlier quoted context omitted.
You know that you can edit your merge commits any way you want and you don't have to rely on resolution strategies to do it for you, right?
Right. That's the entire basis for the discussion here. So why is this a question?
Earlier quoted context omitted.
Right. That's the entire basis for the discussion here. So why is this a question?
Because you already have all the needed tools to handle your special little edge case (in multiple ways!), so the discussion seems rather pointless.
Earlier quoted context omitted.
Because you already have all the needed tools to handle your special little edge case (in multiple ways!), so the discussion seems rather pointless.
You are confused. It's frightening that someone would be able to reach a point this deep into the discussion and think that "You know that you can edit your merge commits any way you want and you don't have to rely on resolution strategies to do it for you" is revealing something new or insightful.
Earlier quoted context omitted.
You are confused. It's frightening that someone would be able to reach a point this deep into the discussion and think that "You know that you can edit your merge commits any way you want and you don't have to rely on resolution strategies to do it for you" is revealing something new or insightful.
So it is pointless indeed, gotcha.