Hi

I did a default configuration on github to begin with . However I was
having problems pulling my changes to the other PC so I have been
messing with the config since. So the config could well be a bit
messed up

If I do
$ git pull origin master
>From github.com:petercutting/rp2
 * branch            master     -> FETCH_HEAD
Already up-to-date.

I dont seem to be bringing my changes across. (I managed to push the
changes to Github).

Some of the config changes I have tried are. No idea what this really
does but suspect it is needed :
git config branch.master.remote origin
git config branch.master.merge refs/heads/master

It would be nice if someone could provide me with a list of commands
that would sort it all out. Here is a start:

# to delete local repo and start again
cd <repos parent directory>
rm -r rp2
git clone g...@github.com:petercutting/rp2.git
cd rp2
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git pull origin master

# and then when working normally
cd <repos parent directory>
cd rp2
git pull origin master
# edit code
git status
git add <files>
git commit -m "message"
# edit more code and repeat
git push origin master

Peter

On Nov 16, 12:07 am, Petros Amiridis <pet...@github.com> wrote:
> If you did the default configuration when you created the repo in
> GitHub you have a remote called origin. Therefore, you can do:
>
>   git pull origin master
>
> work and commit and then do
>
>   git push origin master
>
> You should not have a different user/email per PC, as long as you are
> using the same GitHub account. You can however have different keys per
> PC.
>
> Petros

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

Reply via email to