How was The Six Day War resolved?

Israel won.

The United Nations passed Resolution 242 which created an armistice between Israel and the Arab Nations and set up the land-for-peace trade-off.