El mar, 19-04-2011 a las 17:30 +0100, Leo Butler escribi?:
>
> git checkout master
> git pull # update master branch with any changes from
> SF
> git merge scratch-pad # merge your scratch-pad onto master
> git push origin master # push the changes to SF
Thanks,
I have just commited two changes to module site-xml following these
steps, and it worked fine. The problem is that my SF username is
'riotorto', and the changes were recorded with my username in my local
computer.
I usually commit changes from different machines and different local
user names. Any hint how to fix this?
--
Mario