No, their old content won’t overwrite your updates automatically. If you merge your branch into master first, and then they try to push their outdated version, Git will block it and ask them to pull the latest changes. If there’s a conflict in the same files (like folder xyz), Git will show a merge conflict, and they’ll need to resolve it before pushing. So as long as everyone pulls before pushing, your changes are safe.