Pushing only one folder to remote repo

Question

I\'m using Git 1.7.4.1. I want to push commits I did on one folder to my remote repo. How do I push only changes from one folder to my remote repo? All the documentation

Answer 1

The error that you report is not reporting conflicts - you only get conflicts locally when merging (e.g. as part of a git pull). That error is just refusing to update the remote branch with your commit, since your commit doesn't include the history of the branch you're trying to push to. Typically that means that someone else has pushed some divergent development to that branch and you need to pull or rebase - there's more on that here: How git works when two peers push changes to same remote simultaneously

However, to answer your question directly, commits always represent the complete state of the tree, so you just need to create a commit which only has the changes in the subdirectory of interest. Just change into that subdirectory and use git add to stage the files that you've changed in there. Then, when you commit, make sure that you don't use the -a parameter, otherwise all the changes in your repository will be introduced into that commit.