You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The two removed lines are the end are exactly the last two lines in BASE and HEAD. It could have special case for removals in start and end that match the content and reduce those automatically. git doesn't do it on its own so perhaps there's a good reason not to?
The text was updated successfully, but these errors were encountered:
Just had this conflict:
git-mediate -d
ends with:The two removed lines are the end are exactly the last two lines in BASE and HEAD. It could have special case for removals in start and end that match the content and reduce those automatically.
git
doesn't do it on its own so perhaps there's a good reason not to?The text was updated successfully, but these errors were encountered: