Hi
I have 12+ years of experience in C/C++ on Windows,Linux,Embedded, have worked on merging of code from trunk to branches , and back, have used automatic tools for merging, have used GIT, SVN.
kindly ping me to discuss further, we can negotiate the RATE as well.