Hi guys , we have encountered the problem of workspace.xml when we want to pull the project after someone else made a push before it . It's obviously because we don't work all with the same configurations . Everytime we pull , we always deleteed ton of messages of merging in workspace.xml and even used git push --force !