Git code merging

Question

I am in need of some assistance.

Here's the scenario:-

I checked out a repo from GitHub using NetBeans and it was opened as a Java project. I added some functions to the project. Now when the maintainer of the GitHub repo pushes an update, how would I get my copy to have all of the changes that the latest one has without re-checking out the HEAD revision and copy pasting the functions manually?

Thanks in advance!

Sincerely.

score 1 · Accepted Answer · answered May 27 '14 at 06:27

1

With Netbeans, what you would do is:

a fetch

enter image description here

then a rebase of master on top of origin/master (with NetBeans 7.4+, Nov 2013)

answered May 27 '14 at 06:27

VonC

1,262,500
529
4,410
5,250

When I check the repository out, does it have to be `origin:`? – May 27 '14 at 08:56
@synquall no, it is just what the screenshot was displaying. In your case, you should fetch from the right remote. It usually is 'origin', but its associated url depends entirely on your own project url. – VonC May 27 '14 at 09:10
Alright, will try it in a bit and I will get back to you. – May 27 '14 at 09:35
Finally figured out how to use it. Thanks! – May 29 '14 at 02:22

score 0 · Answer 2 · edited May 23 '17 at 12:20

0

When you are ready to PUSH from NetBeans, it will let you know you are behind the HEAD, forcing you to PULL first.

Preemptively, You'll want to PULL or FETCH to get the latest changes. The differences between the two can be found here What is the difference between 'git pull' and 'git fetch'?

edited May 23 '17 at 12:20

Community

1
1

answered May 27 '14 at 06:20

RS3

194
1
3
15

score 0 · Answer 3 · answered May 27 '14 at 06:21

As stated in the comment, issuing the pull command will get the remote copy and merge it into the changes you made on the local repository:

git pull <remote> "Fetch the specified remote’s copy of the current branch and immediately merge it into the local copy. This is the same as git fetch followed by git merge origin/."

Another option is:

git pull --rebase <remote>

which will use rebase rather than merge to integrate the remote branch. See this tutorial, for example.

Git code merging

3 Answers3