For sure.  This is where I was fumbling to try to get it all working:

1. I set up a repository on the desktop, with the "Git init here" context 
menu on the folder 
2. I add code and commited:
  git add . --all
  git commit -m " some comment"
3. On thing to note is I don't have a master branch...'master' didn't make 
much sense to me, I have a release branch and feature branches.  At the 
moment I am working in the feature branch 'admintemplate' with the view to 
merge it into the release branch when it is ready.
4. I installed gitblit on my thecus NAS and set up a repository using the 
5. I created the remote:
git remote add thecus <url provided by gitblit>
6. I pushed the Desktop code to the Remote:
git push thecus admintemplate
7. I created a git repository on the Laptop using "Git init here"
8. I then added the remote to the Laptop (as in step 5. above)
9. I think I just did a pull to get the code from the remote to the Laptop:
git pull thecus admintemplate
10. Modified code on the Laptop, pushed back to the remote.
11. Performed a pull from the remote to the Desktop...and that's when I got 
the merge conflicts:
git pull thecus admintemplate

Where I feel unsure is about tracking and cloning...I have read the basic 
docs but my understanding is not deep enough to know exactly what is going 
on under the hood.

I set up the remote with the following:
git remote add thecus 

On Saturday, 7 December 2013 03:41:46 UTC+11, Alex Lewis wrote:
> From what you've said your assumption is correct, it should just be a 
> fast-forward pull/merge on the desktop at the end. Is there any chance you 
> could provide the Git commands you're using at each stage? It might also be 
> useful to know how you set up the repositories in the first place.
> Cheers,
> Alex
> On Thursday, 5 December 2013 12:08:14 UTC, Phillip Tutt wrote:
>> Hi guys,
>> I am pretty new to git, but I have found that it doesn't work as I would 
>> expect.
>> I work sometimes from my laptop and other times from my desktop, each 
>> having a local git repository.
>> I have set up a remote, which I push the changes from my branches to.
>> Now, what I would expect is something like this, where each letter 
>> represents the code of a commit.
>> Desktop A--B          C
>>                    \         /
>> Remote        B      C 
>>                      \     /
>> Laptop            B--C   
>> 1. A = Initial commit on local repository
>> 2. B = commit some changes
>> 3. B = changes pushed to remote
>> 4. B = code pulled from remote to laptop
>> 5. C = commit some changes made on laptop
>> 6. C = push changes from laptop to Remote
>> 7. C = pull changes from remote back to original branch on desktop.
>> The command I used for step 7 was: git pull <remote> <branch>
>> What I would expect is the code now on the desktop would be the same as 
>> what was on the laptop...however, I found that some kind of merge was 
>> happening and conflicts, but shouldn't it just be a fast forward?
>> Note, I did not make any changes on the desktop from the time I pushed to 
>> the remote to the time I pulled back down, but even if I did, I would 
>> expect the merge to work, but I don't have much faith in it at the moment 
>> due to my limited experience.
>> There's probably an easier way to achieve what I am doing, but hoping 
>> someone can provide some guidance?
>> Thanks in advance.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
For more options, visit

Reply via email to