...
[15:29:23 CDT(-0500)] <EricDalquist> if the conflicting file has different areas that changed
[15:30:01 CDT(-0500)] <JoeMoore> origin https://github.com/Jasig/uPortal.git (fetch)
[15:30:06 CDT(-0500)] <JoeMoore> origin https://github.com/Jasig/uPortal.git (push)
[15:30:31 CDT(-0500)] <EricDalquist> ok