git remote probes merges and arbres local and remote diferents: dos persones treballant-hi
Merge branch 'master' of https://github.com/sagiss/gitproject
merging done