merge vs. rebase question

As a git noob I am having trouble understanding when to use which commands. I have a repository (bare) on my Linux server. I also created a build directory as a local repository. In my build script I do a 'git pull' to make sure the build directory is up to date. No changes are made to my source so

Re: merge vs. rebase question

On Thu, Jan 17, 2013 at 9:14 AM, Dennis Putnam wrote: > As a git noob I am having trouble understanding when to use which > commands. I have a repository (bare) on my Linux server. I also created > a build directory as a local repository. In my build script I do a 'git > pull' to make sure the bui

Re: merge vs. rebase question

Thanks for the reply. I'm afraid this question has become moot. I can no longer reproduce the problem as it is now working as expected. I did find an incorrect ownership on one of the 'objects' sub-directories but I would think that should have given me an error. Perhaps I used root at the wrong ti