Git project update in ubuntu

Question

I am doing a project on website building in my ubuntu system.I am quite new to it.And my project is maintained by Git repository.

My problem is that I dont know how to update my project codes to the latest by using the Git repository system.So,I want a detailed step 2 step way to do this.

I am using Ubuntu 12.04.Please dont mind asking any further details.

Any valuable answer would be highly appreciated.

Thank you.

"git pull origin master" is this what you're looking for? – arash kordi Dec 03 '12 at 06:41 — arash kordi, Dec 03 '12 at 06:41
I have no idea..I told I am a nerd,sorry – nerd Dec 03 '12 at 06:46 — nerd, Dec 03 '12 at 06:46

score 1 · Answer 1 · edited May 23 '17 at 12:18

1

Personally, I prefer to rebase as it brings lineal history:

$ git fetch && git checkout your-branch && git rebase origin/your-branch

Or you can merge - depending how you want your history look like:

$ git fetch && git checkout your-branch && git merge origin/your-branch

The simplest method would be:

$ git pull

But I would not recommend it as it might bring you some troubles. Actually, it fetches and merges code - like two commands at once.

More info could be found here: What is the difference between 'git pull' and 'git fetch'?

Read on tutorials: Top 10 Git Tutorials for Beginners

edited May 23 '17 at 12:18

Community

1
1

answered Dec 03 '12 at 06:40

Roman Newaza

11,405
11
58
89

But many of my team mates are on the same project.Now how should I do it – nerd Dec 03 '12 at 06:45
I posted the link to some tutorials ^ – Roman Newaza Dec 03 '12 at 06:51

score 0 · Answer 2 · answered Dec 03 '12 at 07:22

Merging is preferred over rebasing for the following reasons:

fewer conflict resolutions
when someone uses your project as a submodule, you don't ruin their history
you can't guarantee that the same changes would have been attempted from a new starting point.

You can read up on my work-flow here: http://dymitruk.com/blog/2012/02/05/branch-per-feature/

For a great book on git, I would recommend: http://progit.org/book

Once you understand the Directed Acyclic Graph (DAG) it will all make sense. My friend recently said that to understand git and how to get something accomplished you must "be the graph".

Git project update in ubuntu

2 Answers2