Question

Consider this folder structure in repository

Root
|----Plugins
|----|-----Plugin1
|----Themes
|-----|----Theme1

I have all the code pushed into the server. I have some local changes in Plugin1 folder which I have not committed and I don’t want to right now. I have some changes in Theme1 folder which I need to commit. I can commit it all right, but when I push it complains me to do a pull or stash my changes. Isnt there an easy option to push changes of just one folder than having to worry about all the local changes in different folders under same repository? In SVN I can just individual checkin any files without worrying about the others.

Answer 1

git stash IS the easy option. After doing the commit, stash, pull, push and then pop the stash.