Win a copy of Murach's Python Programming this week in the Jython/Python forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic

git true merge  RSS feed

 
John Losty
Ranch Hand
Posts: 75
  • 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: 75
  • 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
Sheriff
Posts: 36396
453
Eclipse IDE Java VI Editor
 
John Losty
Ranch Hand
Posts: 75
  • 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!