Win a copy of Reactive Design Patterns this week in the Functional Programming forum
or Learn Linux in a Month of Lunches in the Linux forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic

git true merge

 
John Losty
Ranch Hand
Posts: 73
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
How can I demonstrate git true merge?
I would like to use only 1 txt file if it is possible.
 
John Losty
Ranch Hand
Posts: 73
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
I couldn't find in this link anything about git.
 
Jeanne Boyarsky
author & internet detective
Marshal
Posts: 35546
403
Eclipse IDE Java VI Editor
 
John Losty
Ranch Hand
Posts: 73
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
I don't know but I now that there is fast forward merge and merge conflict.
 
  • Post Reply Bookmark Topic Watch Topic
  • New Topic
Boost this thread!