How to deal with synchronisations over floobit that have to be synced to a git repo remotely

[CMCDragonkai]

Imagine:

User A repo
User B repo
Remote repo

Both user A and user B commit and push to Remote repo

Now floobits seems to exchange changes between User A and User B independent of the Remote repo.

Now who commits and pushes the final changes to the Remote repo?

What's a good workflow to this? I'm thinking it could easily result in merge conflicts...

[btipling]

What we do is one person commits, the other cleans their workspace and pulls. Who that person is is up to you. Floobits doesn't currently know about any VC system and will stomp over your files when you join (unless you choose to overwrite the files in the workspace, which will stomp over everyone else's files connected to the workspace). So be sure you've committed any unsaved changes before you join.

My process after being in a workspace where someone in the workspace else committed our work:

git stash -u
git pull
git stash pop

Sometimes I may just want to git reset --hard and git clean -f depending on what I do next.