Git pull error after setup c9 with Bitbucket

bitbucket
git

#1

Hi there,

I just started a c9 account for my Ruby project to collaborate via Bitbucket with my local repository. After succesfully cloning my repository to c9 from Bitbucket I changed database.yml to configure my app to work with the MYSQL server of c9. Since I do not want database.yml to be copied to my local repository and vice versa I created and added this file to .gitignore (a file that seems hidden on c9… why?). After pulling the latest version from origin master I now get the error message:

error: Your local changes to the following files would be overwritten by merge:
.gitignore
Gemfile.lock

What is going wrong here? Did I miss something? Adding Gemfile.lock to .gitignore does not yield a different error. Any help is appreciated


#2

Hey @Mingus85 :slightly_smiling:,

Did you create your .gitignore file in ~/workspace/ ?
The .gitignore file always shows for me in that workspace root folder.

:computer: :cat2:


#3

Yes it exists (and I can open). But as I understand I should not add Gemfile.lock or .gitignore itself to this file

Actually, it seems as if my .gitignore file is not working on c9. Is this possible, or am I doing something wrong?

.git/info/exclude also seems to do nothing