On Fri, May 16, 2014 at 5:02 PM, Enrico Forestieri <for...@lyx.org> wrote:
>> Merge the remote changes (e.g. 'git pull') before pushing again. See the When I get this error, doing a git pull --rebase is usually what I want. Git will not let you push if you do not have the latest version. Even if you edited a file that does not conflict with the updates you don't have. The "--rebase" just tells git to put your patch on top of the commits that you're going to pull in. Scott
