Comment by nathanpankon

There are some attempts at this (semanticdiff, etc) and they seem very good. But I was looking for a tool that could actively edit a set portion of code, maintaining a small diff above a moving target

In that case merging from "main" starts to be extremely difficult