Say one cloned a repository and his main job is to edit it locally. What is the proper operation to follow so that he can just merge with the initial upstream while keeping his changes? i.e. like 'Update' in TortoiseSVN.