Thanks for your fast answer, Konstantin!

> It's hard to tell exactly what's going on as you did not tell anything
> about your setup and are using vague terms like "my dir".

My dir refers to the git controlled directory, the wordpress installation
directory.

> In any case, I have two points to tell:
> 1) When fetching from a remote repo, to make a remote branch named
>    "online" end up as remote/origin/master you would have to pass
>    git-fetch a specially formed refspec; I assume you did not do this,
>    so probably the problem is elsewhere.

Not exactly. The "online" branch is local. The remote repo is a newly
created one, and thus does not have any branches in it. But I´ve read
somewhere that a git fetch would just get the content of the remote repo to
the current branch.

So, if I do
git checkout online
git fetch

I expected to get all my remote content into my current branch "online", and
not in a new branch "remote/origin/master". But it is ok, not a big deal, as
it is easily managed (as I can create a new local branch from
origin/master).

Then, I´d like to be able to merge or rebase my local master branch (that
holds my release version) with this local online branch (that would hold my
actual copy of the live site), and then git pull everything to the live
site. That would be beautiful.

BUT when I try
git checkout master
git rebase origin/master

or
git checkout origin/master
git rebase master

(anyways, whitch is the right way to do it? I couldn´t find a clear
explanation and the rebase sintax is a bit confusing)

I get a merge conflict for every single file in the repository (even the
ones that are listed in the .gitignore file). This is weird because I know
that only 10 or 12 files where really modified in my local branch. Besides
that, the merge shows me all files as conflicts but both versions are
exactly the same in local and in remote.

I know the files are exactly the same because the master branch is my local
testing environment and right now it is just like my live site (i.e. no
development has been made locally or remotely). Weird.

> 2) Please take time and try to familarise yourself with the concepts
>    behind remote branches; [1] will help, for instance.
>    Otherwise you'll keep bashing the problem without clear idea about
>    your actions.

Yes, I will, thanks for the advice ;) The git books are aways open here...

> Provided I correctly guessed your setup, the simple demonstration of how
> fetching a branch named "online" from a remote repo should be done in your
> case is presented at [2].
>
> 1. http://progit.org/book/ch3-5.html
> 2. http://pastebin.com/6B011dip

Wow, I´ll have to review it slowly :)

Thanks for your time!!

Daniel

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to