...
[15:26:44 CDT(-0500)] <EricDalquist> great
[15:27:57 CDT(-0500)] <JoeMoore> stash pop had a conflict on cas/pom.xml which is also not a surprise. I'll double check that one.
[15:28:04 CDT(-0500)] <EricDalquist> sounds good
[15:28:08 CDT(-0500)] <EricDalquist> you'll need to resolve the conflict
[15:28:19 CDT(-0500)] <EricDalquist> then do "git add cas/pom.xml"
[15:28:33 CDT(-0500)] <EricDalquist> oh wait ... soprry this was from the stash pop
[15:28:35 CDT(-0500)] <EricDalquist> ignore that git add bit
[15:28:43 CDT(-0500)] <EricDalquist> I was thinking we were resolving a merge issue on the cherry pick
[15:28:47 CDT(-0500)] <EricDalquist> so one more question
[15:28:53 CDT(-0500)] <EricDalquist> what does "git remote -v" show you?