git pull. too often i found breake so i inspect git-log message prior to update, git-bisect came in handy once