Hello I am using Android Studio 2020.3.1 Patch 4. I'm using Git and committing a state. And then add some code and I want to return to where I was (before I entered the new code). When I checkout it does nothing. Even if I restarted Android Studio. And when I Reset Current Branch to Here.. initially it does nothing but if I restart the Android Studio new code is gone(as I wanted). What am I doing wrong?
The correct command to remove the newly added but not commited code is:
git stash
It will remove the unstaged codes and return the code-base to the last commit.
We normally use 'git checkout' to move around between different commits.
If you want to do this process without command, you will need to "Rollback changes". The keyboard shortcut for macos for this is: option + command + z.
Related
Something very weird is happening.
I am on the master branch of my repository. After calling git pull I get the latest version of the code on the master branch, everything is ok.
But for some reason, Android Studio, after some seconds, changes the code, so that now, even if I do git pull I get Already up-to-date but if I call git status I see changes not staged in red. How is that possible?
Also, if I click cmd+z I can see for few seconds how the code added by Android Studio goes away, and immediately comes back.
I tried deleting the entire project and cloning again from the repository, and again I get the latest version of the fresh code, but after few seconds Android Studio changes it.
All that happens in a particular file and section of code.
When you make git pull it doesn't reset or throw the changes you have non staged, you have to commit them the only reason you would see a problem with these files were is there was a conflict and git would notify you and tell you you need to commit before the pull.
so if you want to commit these change you need to do:
git add .
git commit
or if you want to throw away these changes you need to do:
git reset --hard HEAD
that last command would let you with the exact same code as in the remote repository.
That's happening because each time you opening a project with Android Studio, it will check for Android Studio project configuration files. When Android Studio did not find any of these files, it will create them. The configuration files will be in the .idea folder. Therefore, you will see a red mark for those unstaged files.
I want to discard the local changes I made in an Android Studio project.
I tried to perform a pull, the GUI gives me 5 options, which option should I choose?
Octopus
Ours
Subtree
Recursive
Resolve
In Android Studio do the following:
-Open the Version Control tool window Alt+9 and switch to the Log tab.
-Select the recent commit and right click on it than select Reset Current Branch to Here.
-A Git Reset popup will open -> select Hard -> click Reset
You originally asked which strategy argument to use with git pull to discard your own work (there is a pending edit that will change the question, if the edit is approved). The answer is: None.
Don't use git pull at all. Run git fetch first:
git fetch origin
This brings over all the new stuff from the other Git you have your Git calling "origin".
Now that you have everything they have, simply stop using what you have been using, and switch to theirs:
git reset --hard origin/master # assuming you're on your "master"
You may also want to use git clean -fdx to remove build artifacts, but that's a separate issue.
In Android studio do the following:
Go to VCS -> Git -> Reset HEAD
Change Reset type to hard
I am using Android Studio 2.0 Beta 6 on Ubuntu GNOME. I am facing a strange problem. I am using git version control in my Android project. After building the project, when I click on commit changes through Android Studio GUI. The commit changes dialog box shows every file as changed. When I click on any file, it says contents are identical. I am attaching the screenshot below, clicking on any files says contents are identical.
So my question is, Why Android Studio shows files with identical changes in commit changes dialog and how can I solve it? I tried google but didn't found any related question.
It must be because of automatic file encoding changes by the IDE (In case you imported the project from somewhere else). Sometimes IDEs apply them automatically. Just revert the changes and do a clean and build. If the changes appear again, you will need to do a commit once and after that you'll be allright.
To verify you can just go to a normally behaving file. Open it in notepad and just save as from notepad with another encoding. It should show as modified thereafter in the version control window.
For me it was AS pointing to old git version. Please check the Settings\Version Control\Git
I ran into this issue as well. None of the typical culprits seemed to be at fault. As far as git (from the command line) was concerned, the files were unmodified, yet Android Studio still showed them as modified.
It turns out Android Studio and my command line terminal (cygwin) were using two completely different Git binaries. Android Studio was pointing to a Git installation I had made at some point in the past, while cygwin was pointing to /usr/bin/git, which had come from Cygwin's Git package.
I edited Android Studio's version control settings (as shown in Anton's screenshot) to point to the git.exe within my Cygwin distribution, then did a "refresh file status" from the VCS menu, and all the files went back to showing as unmodified.
I have a stable branch that I am doing some work on. Then to do some experimental stuff, I create another branch called experi and then started doing some work there. Then I switch back to my stable branch. However, android studio is still showing the code for the experi branch. How do I make it so that when I switch from one branch to another, android studio switches content?
I created the branch using
git checkout -b experi stable
and then to switch I do
git checkout experi
basically how do I keep the branches independent?
At least I want to be able to go back to my stable branch (before the news stuff intended for experi)
This is so weird. Everything I did was correct. But in order for the IDE to refresh I have to click on the bottom tab labeled "Version Control". It is next to the "Android Monitor" tab.
Android Studio doesn't sync with your git repo. Make sure you are on the desired branch. Note: SourceTree , AS can indicate you are on a different branch . But the command line never lies.
Synchronize your gradle and clean the project.
In Android Studio : View > Tools Windows > Gradle
I'm making some changes to a test app to see how it works, git + phonegap, and for some reason I dont think phonegap is pulling the latest code. I can see the changes on github, here's the public test: https://github.com/xxAndreixx/prueba
I'm making the changes to the index.html file in the www folder, and I'm trying to install the app after I pull the code and rebuild, on an Android phone and however I can't see the changes when running the app; idk if I'm running the wrong commands on git. What I do is: 1) git commit -m "msg" 2) git push -u master origin
IDK where I'm failing.
#Andrei,
are you pressing the [Update Code] button?
TIL: don't be stupid and follow the correct order while in the ROOT.