I have multiple git changelists in IntelliJ, and now I need to update my local code by doing a git pull from remote. However, I receive an error while doing the git pull which says "Commit/Stash before pulling." I can stash my local code and then pull, but whenever I stash the code, my changelists get merged. Now I need to find a way to overcome this issue. How can I do this in IntelliJ?
Teammate pushed their code to remote, now i need that code in my local setup.
I can't commit my as it doesn't fully developed neither i can't stash , change list will be merged .
Is there a way to do pull without commit or stash ?? or looking for a better solution.
Also, you can start using Shelves instead of Stashing.
See: https://www.jetbrains.com/help/idea/shelving-and-unshelving-changes.html,
Your changes will be saved as patches and changelogs will be preserved.