i am new to GitHub. and using it via Eclipse we are two people working on a application. i am getting following status when i check git status in Git shell.
On branch master Your branch and 'origin/master' have diverged, and have 2 and 1 different commit each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge) Changes to be committed: deleted: client/android/BlueDolphinCore/bin/AndroidManifest.xml deleted: client/android/BlueDolphinCore/bin/R.txt deleted: client/android/BlueDolphinCore/bin/bluedolphincore.jar deleted: client/android/BlueDolphinCore/bin/jarlist.cache deleted: client/android/ChitrguptVersion2/bin/AndroidManifest.xml deleted: client/android/ChitrguptVersion2/bin/R.txt deleted: client/android/ChitrguptVersion2/bin/chitrguptversion2.jar deleted: client/android/ChitrguptVersion2/bin/jarlist.cache modified: client/android/TaraMachines/AndroidManifest.xml modified: client/android/TaraMachines/src/com/RareMediaCompany/TaraMachines/Dataclasses/AllConstants.java Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: client/android/BlueDolphinCore/gen/.gitignore modified: client/android/Devalt/.classpath modified: client/android/Devalt/project.properties modified: client/android/Devalt/src/com/RareMediaCompany/Devalt/CreateBatchFragment.java modified: client/android/Devalt/src/com/RareMediaCompany/Devalt/CreatePlaceActivity.java modified: client/android/Devalt/src/com/RareMediaCompany/Devalt/Tasks/DownloadTask.java modified: client/android/DevaltGithubStaging/project.properties modified: client/android/DevaltTaraAkshar/DevaltGithub/project.properties modified: client/android/TaraMachines/src/com/RareMediaCompany/TaraMachines/Dataclasses/AllConstants.java
I want to commit my code and sync. but Git is not letting me do so. i have Gitignore file too. but still it is asking me to commit bin and gen folder.
what should i do to ignore these files and sync my workspace. and why i am getting this issue. please explain. Thank you