Yes, the SCM tool will make that merge easy, but you still have to do it.

• 是的，源码控制工具将容易的合并，但是你还是要亲自去做。