[git-users] Re: What mechanisms for code comparison and merge between versions on git are used?

2012-06-10 Thread Thomas Ferris Nicolaisen
Hi Carlos, 

You should be able to find some more hints on how merging works here: 
http://git-scm.com/docs/git-merge

I also find the Git book explains the basics pretty well here:  
http://git-scm.com/book/en/Getting-Started-Git-Basics 

And more in detail here:  http://git-scm.com/book/en/Git-Internals 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/FwjJemxg4jQJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



Re: [git-users] Re: What mechanisms for code comparison and merge between versions on git are used?

2012-06-10 Thread Carlos Andrade
Thank you Thomas, I will look into this!

Carlos Andrade
http://carlosandrade.co



2012/6/10 Thomas Ferris Nicolaisen tfn...@gmail.com

 Hi Carlos,

 You should be able to find some more hints on how merging works here:
 http://git-scm.com/docs/git-merge

 I also find the Git book explains the basics pretty well here:
 http://git-scm.com/book/en/Getting-Started-Git-Basics

 And more in detail here:  http://git-scm.com/book/en/Git-Internals

  --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To view this discussion on the web visit
 https://groups.google.com/d/msg/git-users/-/FwjJemxg4jQJ.

 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.