º¯°æ»çÇ×À» ÀÛ¼ºÇÏ´Â ´Ù¸¥ »ç¿ëÀÚ

Fred´Â ÀÚ½ÅÀÇ Workbench¿¡ ÇÁ·ÎÁ§Æ®°¡ ÀÖÀ¸¹Ç·Î ¸î °³ÀÇ ÆÄÀÏÀ» ¼öÁ¤Çϰí HEAD ½ºÆ®¸²¿¡ µ¿±âÈ­ÇÏ¿© ÆÄÀÏÀ» ¸±¸®½ºÇØ¾ß ÇÕ´Ï´Ù.

Fred´Â ´ÙÀ½ »çÇ×À» ¼öÇàÇØ¾ß ÇÕ´Ï´Ù.

1.

file1.txt¸¦ ´ÙÀ½°ú °°ÀÌ ¼öÁ¤ÇÕ´Ï´Ù.

¿ø·¡ ÄÁÅÙÃ÷:

This is the contents
of file 1.

»õ ÄÁÅÙÃ÷(±½ÀºÃ¼·Î Ç¥½ÃµÈ º¯°æ»çÇ×)

This is the contents
Fred-update 
of file 1.

2.

file2.txt¸¦ ´ÙÀ½°ú °°ÀÌ ¼öÁ¤ÇÕ´Ï´Ù.

¿ø·¡ ÄÁÅÙÃ÷:

File2 is a small file
with simple text.

»õ ÄÁÅÙÃ÷(±½ÀºÃ¼·Î Ç¥½ÃµÈ º¯°æ»çÇ×)

File2 is a (Fred was here) small file
with simple text. 

 

3.

³×ºñ°ÔÀÌÅÍ º¸±â¿¡¼­ º¸±â Ç®´Ù¿î ¸Þ´º¸¦ Ŭ¸¯ÇÑ ´ÙÀ½, ¹öÀü Á¤º¸ Ç¥½Ã¸¦ ¼±ÅÃÇÕ´Ï´Ù.

³×ºñ°ÔÀÌÅͰ¡ °»½ÅµÇ¾î ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÕ´Ï´Ù. Fred°¡ º¯°æÇÑ µÎ °³ÀÇ ÆÄÀÏ ">" µÚ¿¡ Ç¥½ÃµË´Ï´Ù.

 

4. ½ºÆ®¸²¿¡ º¯°æ»çÇ×À» ¸±¸®½ºÇϱâ À§ÇØ Fred´Â ´ÙÀ½ Áß Çϳª¸¦ ¼öÇàÇÕ´Ï´Ù.
  • µÎ °³ÀÇ ÆÄÀÏÀ» ¼±ÅÃÇÑ ´ÙÀ½ ÆÀ > ½ºÆ®¸²°ú µ¿±âÈ­¸¦ ¼±ÅÃÇϰųª,
  • ÇÁ·ÎÁ§Æ®¸¦ ¼±ÅÃÇÑ ´ÙÀ½ ÆÀ > ½ºÆ®¸²°ú µ¿±âÈ­¸¦ ¼±ÅÃÇÕ´Ï´Ù.

´ëºÎºÐ ÇÁ·ÎÁ§Æ®¸¦ ¼±ÅÃÇÏ¿© ÀÛ¾÷ÇÏ´Â °ÍÀÌ Æí¸®ÇϹǷΠ¿©±â¼­µµ ÀÌ ¹æ¹ýÀ» »ç¿ëÇÕ´Ï´Ù. ÇÁ·ÎÁ§Æ®¸¦ ¼±ÅÃÇÑ ´ÙÀ½, ÄÁÅØ½ºÆ® ¸Þ´º¿¡¼­ ÆÀ > ½ºÆ®¸²°ú µ¿±âÈ­¸¦ ¼±ÅÃÇÕ´Ï´Ù. 

5. µ¿±âÈ­ º¸±â°¡ ¿­¸®¸é Fred´Â file1.txt¿Í file2.txt¿¡ ´ëÇÑ º¯°æ»çÇ×À» ¸±¸®½ºÇÕ´Ï´Ù.