search

srushti / goldberg

Goldberg is a lightweight CI server written in Ruby which worries about Bundler & RVM so that you don't have to.
Other
243 stars 29 forks source link

Perform a git-reset before doing a git pull #129

Closed skizz closed 12 years ago

skizz commented 12 years ago

In many cases builds modify checked in code (e.g. to configure version numbers) or add files that are not checked in. In this case git will refuse to pull the latest code.

Here's what happens for us (caused by version number updates):

Updating bd57572..8e66512
error: Your local changes to the following files would be overwritten by merge:
    Cali/Cali-Info.plist
    CaliApplicationTests/CaliApplicationTests-Info.plist
    CaliUnitTests/CaliUnitTests-Info.plist
    GTEngineTests/GTEngineTests-Info.plist
Please, commit your changes or stash them before you can merge.
Aborting

To address this problem it is important that Goldberg does a git reset --hard before trying to do a git pull.

rohitarondekar commented 12 years ago

Looks like this issue is resolved with above commit. Can you close it? :)