4
aritzh
3y

Wouldn't, it be amazing if we could have smart merges that understand the basics of the laguage you are using, and umderstands changes like moving a function, and helps by giving suggestions on what could be done to fix the conflict?

Comments
  • 0
    @jAsE yeah, I meant it as a helpful tool. You must obviously understand the chage that was made, but an IDE/Git client that has some kind of suggestions or semi automated options would be nice.
Add Comment