Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
Fix bad merge conflict resolution #50120
b98df6d was incorrectly merged forward into 2018.3 (or into develop, before 2018.3 was branched). This causes failures to redeploy the thin tarball when it has changed, under certain circumstances.
This commit fixes the problem. I'm also leaving in some changes to the logging that I made in the course of troubleshooting this, as they make the border between stdout and stderr more explicit, as well as adding the shim command's retcode.