Im starting to learn git, ive setup a repository in bitbucket (from MAC 1), cloned the repository in MAC 2. Then modified the project in MAC 1, and MAC 2 (no branching, both still working on master branch) pushed changes from MAC 1 with no problems. Then following this guide
http://www.atlassian.com/git/workflows#!workflow-centralized
from MAC 2 to push my changes
git push origin master (with the obvius errors, because the modifications made in MAC 1)
git pull --rebase origin master (some conflicts here)
git add -A (solved conflicts, and adding to stage, some of the conflicts where in the main rbvcp file, simply stagged the local rbvcp)
git rebase --continue (apparently everything ok)
before pushing, i checked the project fom inside real studio, and the thing is as follows
The sad thing, when i open the project in real studio in MAC 2, i see some duplicated objects in the project (i guess the ones not touched in MAC 2) the files are not duplicates, only the objects inside the project, it seem like some weird thing is happening to my rbvcp file.
Please help, this thing is driving me nuts, i really want to use real studio with git
by the way, i applied the dos2unix to the project files before working with them on git, also followed this guide
http://kellerfarm.com/life/rbvcp/