Modify git merge info. · 16e2d74ea9 - NRNU MEPhI git-based development collaboration service

Modify git merge info.

- Add precaution about merge conflicts.

testuser1 5 years ago

parent

ca1637af2b

commit

16e2d74ea9

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
bob.txt
							 
								View File
							
				@@ -6,3 +6,5 @@ $ git checkout TO
			
				 Do merge:
			
				 $ git merge FROM
			
				+
			
				+Beware of conflicts! :)