The Studio now enables you to:
edit conflicts manually in the Job Compare editor in order to merge the good parts of both sides to achieve the best working solution.
merge design changes component by component and connection by connection in the Job Compare editor
view the result after a pull or merge operation
view uncommitted changes made on a local branch, if any, when performing a push or pull operation or switching to the associated remote branch, and chose how to handle those changes.