setup git root
the solution to the problem A
Merge remote-tracking branch 'origin/gcj'