Page 5 of 5

Re: [SOLVED] GIT

Posted: Thu Jan 07, 2016 2:43 pm
by it0uchpods
No problem, you are the same SHM from mumble right?

Hi, I'm ATC411.

Re: [SOLVED] GIT

Posted: Thu Jan 07, 2016 3:16 pm
by SHM
Yes that is me. Yeah I knew you were 411 :D

SHM

Re: [SOLVED] GIT

Posted: Thu Jan 07, 2016 5:08 pm
by it0uchpods
Roger that SHM. :)

Re: [SOLVED] GIT

Posted: Tue Apr 12, 2016 1:12 pm
by SHM
Hi there,
Could someone tell me how I can make changes to a branch I've created?

SHM

Re: [SOLVED] GIT

Posted: Tue Apr 12, 2016 1:35 pm
by sanhozay
You mean how to change the files in the branch?

If so, you just checkout the branch and edit the files using a text editor.

Code: Select all

git checkout <your branch>


One you are happy, add them to the staging area:

Code: Select all

git add <list of files or directories where you have made changes>


And commit, with a useful commit message (something significantly better than "fixed a bug"):

Code: Select all

git commit


For a tutorial, see here: https://www.atlassian.com/git/tutorials/saving-changes

Re: [SOLVED] GIT

Posted: Tue Apr 12, 2016 1:58 pm
by SHM
I'm trying to push another variant of RJAA and I need to completely change the objects folder.

I'll try it out.

Thanks
SHM

Re: [SOLVED] GIT

Posted: Tue Apr 12, 2016 4:31 pm
by sanhozay
Pushing to a remote repository is a slightly different matter, but all covered in the excellent Atlassian tutorial.

https://www.atlassian.com/git/tutorials ... g/git-push

I usually keep a dedicated upstream branch locally to push from, doing work in a separate branch. Then when I am happy, I merge the changes from the work branch into the upstream branch and push. Then I can always see what's on the remote repo by checking out the upstream branch.

Code: Select all

git checkout work
# do something interesting
git add .
git commit
git checkout upstream
git merge work # merge the changes I did in work
git push upstream # push it to the remote

But if I completely mess up the work branch, or just don't like it, I can just delete it and recreate it, e.g.

Code: Select all

git checkout upstream # check out my local copy of what is upstream
git branch -D work # delete the branch I didn't like
git checkout -b work # make a new work branch, copied from the upstream

Re: [SOLVED] GIT

Posted: Tue Apr 12, 2016 4:38 pm
by SHM
Thanks so much for your help. It worked. :D

SHM