从bitbucket更新android项目会导致二进制合并冲突

I'm in the process of learning android development and I want to be able to develop from work, home or my laptop so it made sense to use github or bitbucket as a central repository. I chose bitbucket so I didn't have to learn in public so to speak.I'm in the process of learning android developm