Rene Rivera wrote:
I can't merge from develop to master now :-(
Why not? I can: C:\Projects\boost-git\boost\libs\predef>git status # On branch master nothing to commit, working directory clean C:\Projects\boost-git\boost\libs\predef>git pull Already up-to-date. C:\Projects\boost-git\boost\libs\predef>git merge develop Auto-merging build.jam Merge made by the 'recursive' strategy. jamroot.jam => build.jam | 3 +-- test/.gitignore | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) rename jamroot.jam => build.jam (81%) C:\Projects\boost-git\boost\libs\predef>git status # On branch master # Your branch is ahead of 'origin/master' by 18 commits. # (use "git push" to publish your local commits) # nothing to commit, working directory clean