Fix merge fail - Githubissues

servalproject / serval-dna

The Serval Project's core daemon that implements Distributed Numbering Architecture (DNA), MDP, VoMP, Rhizome, MeshMS, etc.

http://servalproject.org

Other

171 stars 80 forks source link

Fix merge fail #64

Closed rom1v closed 11 years ago

rom1v commented 11 years ago

Merge 4e3c93e failed: it should contain log.c from a1a296f, not a mix between both varargs fix implementations (the other is f88dff0).

The resulting merge fails tests (on 64 bits architecture), while both parents pass.

Before merging fix-log-stdarg (a1a296f) in development, you should have reverted commit f88dff0 on development (because it is an alternative implementation)…