search

MDP-Team / MDP-Assignment

Assignment for Mobile Device Programming Study Unit
0 stars 0 forks source link

Commit & Push from PC not showing here. Laptop does not want to pull (error) #3

Closed DodoSerebro closed 10 years ago

DodoSerebro commented 10 years ago

Guys, I did a push from home with some of the work I did, especially in Main_Activity.java where I added some Toast for testing, and even added a new button to the action bar (Where you have those 3 dots) and added "Filter Events" with the array

But none of the .java files are showing that I did any work. the only things that got committed and showing are the .xml files...

Did you set any option that .java files do not get committed, or basically my github on pc is screwing up??

Also it is not letting me PULL on my laptop saying certain merges are going to overwrite stuff (which I believe that is the whole damn point)

dannydes commented 10 years ago

Hi Do,

Regards committing, have you tried git add [folder] through Git Bash? That did the trick last time on Charlene's laptop, so it could be an issue with IntelliJ/Android Studio. And no, there isn't even a .gitignore at the root of this repo so excluding .java files should not even be possible.

Before pulling, it is ideal to make sure you commit your work and there aren't any conflicts. (We could do this by working on different files, which is the case at time being.)

Since you are having a hard time with the Git integration provided by the IDE, I suggest to download and install Atlassian's Source Tree. It does one thing and does it well.

Regards, Daniel