If golf is added to the Olympics and if scheduling conflicts with the major tournaments can be sorted out Im not so sure that it would be a team competition. It could take place in an individual matchplay format with for example the top 64 players in the world rankings being eligible for the competition subject to a limit of no more than three competitors from any one country to avoid the likes of the USA and Australia dominating the competition.
Obviously there is a long way to go before golf does become an Olympic sport but I suppose we will just have to wait and see.