OK, I tried again and it worked. No idea what happened on my first try. Git
mysteries :-\
On Thu, Jun 5, 2014 at 10:11 AM, Peter Dimov
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
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/ mailman/listinfo.cgi/boost
-- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail