search

FRC2706 / MCMergeManager

A FIRST Robotics scouting app for Android developed by Team 2706.
MIT License
0 stars 2 forks source link

Updated the gitignore #198

Open ounsworth opened 6 years ago

ounsworth commented 6 years ago

Grabbed a gitignore file online that's made for Android Studio.

I could use a second pair of eyes on this: even with this .gitignore, my git is still suggesting that I commit my Scouting/Scouting.iml file. I don't get it.

GabbyGenereux commented 6 years ago

After talking with Justin, we're suggesting merge the .gitignore to a local branch of yours, then change Scouting.iml and see if it picks the changes up

ounsworth commented 6 years ago

Is this what you're asking for?

➜  MCMergeManager git:(mike_gitignore) git status
On branch mike_gitignore
Your branch is up-to-date with 'origin/mike_gitignore'.
nothing to commit, working tree clean
➜  MCMergeManager git:(mike_gitignore) echo "broken test line" >> Scouting/Scouting.iml 
➜  MCMergeManager git:(mike_gitignore) ✗ git status
On branch mike_gitignore
Your branch is up-to-date with 'origin/mike_gitignore'.
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:   Scouting/Scouting.iml

no changes added to commit (use "git add" and/or "git commit -a")

There is clearly something I don't understand about .gitignore, because I don't think it should be flagging Scouting.iml as a change ... ??