Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .idea/vcs.xml to .gitignore #1907

Merged
merged 2 commits into from
Sep 28, 2020
Merged

Add .idea/vcs.xml to .gitignore #1907

merged 2 commits into from
Sep 28, 2020

Conversation

BenHenning
Copy link
Member

This file doesn't actually need to be shared across the team, and it's been the cause of some confusion.

This file doesn't actually need to be shared across the team, and it's been the cause of some confusion.
Delete since it's now being ignored.
@BenHenning
Copy link
Member Author

This needs to be verified by me locally before I can send it for review. My Android Studio is currently occupied, though, so it may be a little bit before I get a chance to check it.

@BenHenning
Copy link
Member Author

This seems to work correctly: when I open Android Studio on this branch it silently replaces vcs.xml and that doesn't show up in the staging area since it's being ignored now. I don't use Git within Android Studio, but the new file doesn't seem particularly special, so I suspect that this should work for everyone.

I suggest we submit this as-is and see if anyone actually reports issues.

@BenHenning BenHenning marked this pull request as ready for review September 25, 2020 05:38
@BenHenning
Copy link
Member Author

FYI @Victor-Titan

Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, good to go with this, Thanks @BenHenning

@BenHenning
Copy link
Member Author

Thanks @anandwana001! Merging this now.

@BenHenning BenHenning merged commit ff29333 into develop Sep 28, 2020
@BenHenning BenHenning deleted the ignore-vcs-xml branch September 28, 2020 20:56
@MohamedMedhat1998
Copy link
Contributor

@BenHenning After merging with the latest develop, I lost my .idea/vcs.xml. I can get it from any project but I suggest that you send an email about that to Oppia-android-dev so that people are aware of this PR.

@BenHenning
Copy link
Member Author

As mentioned on the Hangouts chat, you should be able to reopen Android Studio after taking updating to the latest develop & it will recreate .idea/vcs.xml (at least, that's what I observed).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants