yea the rebase in idea uses the same merge conflic...
# random
t
yea the rebase in idea uses the same merge conflict tool. works great