How to Get Latest From Source Control?

Nov 17, 2012 at 1:03 PM

Hi,

I made a fork from a CodePlex GIT repository and then made some changes to a few files.  The owner of the project has recently checked in some updates to "master".

How do I run a "Get Latest" command like in TFS?  I don't see any obvious option for this in the context menu for my solution.

I did some research about GIT and frankly I'm very confused.  The first answer that I came across was simply to execute "git rebase master" on the command line (ugh), but running that simply outputs: "Current branch master is up to date".

Then I found a few more articles about rebase that are much more complicated.  For example, this one.

I'm very confused.  I just want to use a very simple UI like in TFS without strange command line options.  Is this possible?  If not, is there a single, very straightforward command line option that I can use to update my fork from the master?

Thanks,
Dave

Nov 17, 2012 at 1:33 PM

Hi,

I just ran the following commands and I guess that it worked.  How do I know for sure?  How do I know if there were any merge conflicts?  If there were, how do I resolve them?

Me@MyComputer /c/path/Rx (master)
$ git remote add upstream https://git01.codeplex.com/rx

Me@MyComputer /c/path/Rx (master)
$ git fetch upstream
remote: Counting objects: 18, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 11 (delta 7), reused 6 (delta 2)
Unpacking objects: 100% (11/11), done.
From https://git01.codeplex.com/rx
 * [new branch]      master     -> upstream/master

Me@MyComputer /c/path/Rx (master)
$ git merge upstream/master
Merge made by the 'recursive' strategy.
 Ix++/src/cpplinq/linq.hpp | 2 +-
 Ix++/unittest/makefile    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Me@MyComputer /c/path/Rx (master)
$

Thanks,
Dave

Nov 18, 2012 at 7:57 AM
Edited Nov 18, 2012 at 7:58 AM

GIT would have told you to fix conflicts.

Also git diff against upstream/master would show you the merge conflicts.

From an tutorial:

$ git merge iss53
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.

Nov 18, 2012 at 3:38 PM

Hi,

Thanks.

- Dave