Re: [Libpdfxx-devel] git merge and boost problem

[Matchman <mat...@gm...>]

Hi Larry,

On Fri, Jul 16, 2010 at 9:53 PM, lj8888 <lj...@us...> wrote:
> Hi guys,
> Two questions:
> 1) what's a good way to resolve a merge error problem with git? Usually I
> get that when I am developing stuff and then there is a new project commit,
> which then would merge only with errors with my local replica. So far the
> only way to fix it was to delete my local copy and pull a new fresh copy
> from the project. I hope that there is a better way.

Can you give me an example on the git error message when this happens?

> 2) (more important) I am getting compile time errors for libpdfdoc with the
> latest commit from July 13:
> 1>C:\Program Files\boost\boost_1_42_0\boost/exception.hpp(9) : fatal error
> C1189: #error :  The header <boost/exception.hpp> has been deprecated.
> Please #include <boost/exception/all.hpp> instead.

I have changed it to:

#include <boost/exception/exception.hpp>
#include <boost/exception/info.hpp>

Thanks.

Match