Reputation: 93
I've made 2 separate changes: Added feature Uploaded an image
The feature is not approved yet so I can't commit and push it yet. But image is fine so I have to push it.
When I try to push it, it tells me to do the pull. When I try to do the pull, it tells me that feature change that I've made will be removed unless I commit them.
It there a way just to push an image?
Thanks
Upvotes: 0
Views: 946
Reputation: 521239
If the image change is fine, then there is no reason not to commit and push it:
git add path/to/image
git commit -m 'made image change'
git push origin master
Assuming the remainder of the changes are for the feature, you could stash those changes:
git stash
Then, pull in the latest changes from the remote branch via:
git pull origin master
Finally, apply your stash:
git stash apply
Now your image change is on the server, and your working directory has the feature work. If you get merge conflicts along the way, you will have to resolve them.
Upvotes: 1