...
[13:11:45 CDT(-0500)] <athena> 
[15:52:09 CDT(-0500)] <athena> ok, so to merge changes from uportal trunk into the umobile branch
[15:52:22 CDT(-0500)] <EricDalquist> I think:
[15:52:27 CDT(-0500)] <athena> i assume i'd check out the umobile branch
[15:52:28 CDT(-0500)] <EricDalquist> git checkout umobile
[15:52:30 CDT(-0500)] <athena> then merge the master into it?
[15:52:31 CDT(-0500)] <EricDalquist> git mege master
[15:52:32 CDT(-0500)] <athena> and then push?
[15:52:35 CDT(-0500)] <EricDalquist> yup
[15:52:38 CDT(-0500)] <athena> ok
[15:52:44 CDT(-0500)] <athena> shall try