search

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.
Other
299 stars 383 forks source link

Who, Git or GitHub, does keep track of merge? #641

Closed rgaiacs closed 9 years ago

rgaiacs commented 9 years ago

At our novice lesson about resolve conflicts we have

Git keeps track of what we've merged with what, so we don't have to fix things by hand again if we switch back to the repository in our home directory and pull from GitHub:

and some lines below

We don't need to merge again because GitHub knows someone has already done that.

I believe that we don't need the second line quoted.

wking commented 9 years ago

On Sat, Aug 02, 2014 at 01:52:10PM -0700, r-gaia-cs wrote:

I believe that we don't need the second line quoted.

I agree it's redundant. But it's an important idea (especially when Subversion and other old-school version control systems were bad at recording earlier merges), so I'm not against a bit of repetition here.

Maybe you're suggesting a change from ‘GitHub’ to ‘Git’ in the second line? If that's the case, I agree completely ;). GitHub is just hosting the repository, but the merge logic, etc. is all native Git.