Question

I have a remote that is the same, or similar, to the rails project in my current directory. To sync the two, I do

git init
git remote add origin blah@blah
git pull

The problem is that some of the files I had in my working copy were added (ie not in the remote), so when I do

git status 

it should show a bunch of untracked files. Instead I see the files from the repo that are out of date.
Why didn’t it ask me to resolve conflicts in these files? And where are my old files?

Answer 1

The merge implicit in “git pull” must have overwritten local files that were not committed.

I would suggest this sequence:

git init
git add .
git commit -m"local"
git remote add origin blah@blah
git fetch origin

At this point, observe the repository with “gitk –all”

Merge with

git merge remotes/origin/master

This should let you know of conflicts, if any.
And local files won’t be overwritten.