gistfile1.txt

dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ git merge origin/master
Auto-merging src/ch/adbin/fitair/model/Base.as
Auto-merging src/ch/adbin/fitair/model/customer/Customer.as
CONFLICT (content): Merge conflict in src/ch/adbin/fitair/model/customer/Customer.as
Auto-merging src/ch/adbin/fitair/model/geodata/Address.as
CONFLICT (content): Merge conflict in src/ch/adbin/fitair/model/geodata/Address.as
Automatic merge failed; fix conflicts and then commit the result.
dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ cp model/customer/Customer.as{,.bkp} 
dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ cp model/geodata/Address.as{,.bkp} 
dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ cp _code_generator/model/model/customer/Customer.as model/customer/
dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ cp _code_generator/model/model/geodata/Address.as model/geodata/
dave@tintin ~/git/fitdata-2.9/fitair/src/ch/adbin/fitair $ git commit
src/ch/adbin/fitair/model/customer/Customer.as: needs merge
src/ch/adbin/fitair/model/geodata/Address.as: needs merge
src/ch/adbin/fitair/model/customer/Customer.as: unmerged (c9e6c54d8f0a69cdbb537c963cb544ec680b518b)
src/ch/adbin/fitair/model/customer/Customer.as: unmerged (8977e15ef561071432012e55753ca3799d74ed98)
src/ch/adbin/fitair/model/customer/Customer.as: unmerged (56a3a7b448925a2a762541a2beab4dd14b0578a4)
src/ch/adbin/fitair/model/geodata/Address.as: unmerged (c5a7339f6fb6017f06759b61158e0502d82246ce)
src/ch/adbin/fitair/model/geodata/Address.as: unmerged (08516dc3727a2b32ab333536a99e949c4a6e3fd7)
src/ch/adbin/fitair/model/geodata/Address.as: unmerged (9ec3071479bb1e70966b0af893090bac46c6e949)
error: Error building trees