Collaborating in Git after someone made changes