"phase" usually refers to the angular argument of a function. E.g.,
[tex]
f(\phi)=\sin(\phi)\;,[/tex]
where [tex]\phi[/tex] is the phase. Or, e.g.,
[tex]
f(x,t)=\sin(kx-\omega t)\;.[/tex]
Here, [itex]kx-\omega t[/itex] is the phase. If we have two different waves and the first wave has phase [itex]\phi_1[/itex] and the second wave have phase [itex]\phi_2[/itex] the the "phase difference" is
[tex]
\Delta \phi=\phi_2-\phi_1\;.[/tex]
For example, if I have two wave of the same frequency (2\pi\omega) and wave length (2\pi/k) which travel over different distances (L_1 and L_2, respectively) then there will be a phase difference
[tex]
\Delta \phi=k(L_2-L_1)[/tex]
between the waves.
"Phase Shift" is just what it sounds like--a shift in the phase of a wave. Often this comes up in scattering where the effect of a scatterer on a wave is just to shift the phase of the wave by a "phase shift" (usually denoted by [itex]\delta[/itex]). E.g., For scattering a wave of wavelength 2\pi/k off a (very small) hard-sphere of radius R (very small means kR<<1), the scattering phase shift is [itex]\delta=-kR[/itex]. This means that if I have a wave which is initially of the form
[tex]
\cos(kz)[/tex]
and I scatter it off a very small sphere, the resultant wave is of the form
[tex]
\cos(kz)-\frac{R}{r}\cos(kr-kR)\;,[/tex]
where R is the (small) size of the sphere and r is the (large) distance to the point of observation (viewing screen or whatever).