Difference between revisions of "Git/C2/Branching-in-Git/Khasi"
From Script | Spoken-Tutorial
Hezekiah2016 (Talk | contribs) |
Hezekiah2016 (Talk | contribs) |
||
| Line 10: | Line 10: | ||
| 00:05 | | 00:05 | ||
| Ha kane ka tutorial, ngin pule shaphang: | | Ha kane ka tutorial, ngin pule shaphang: | ||
| − | + | '''Branching''' | |
| − | + | Ban Shna ïa u '''branch''' bad | |
| − | + | Ban Switch hapdeng ki ‘‘‘branches’’’. | |
|- | |- | ||
Revision as of 10:29, 23 June 2017
| |
| |||
| 00:01 | Pdiang sngewbha sha ka spoken tutorial halor Branching in Git. | |||
| 00:05 | Ha kane ka tutorial, ngin pule shaphang:
Branching Ban Shna ïa u branch bad Ban Switch hapdeng ki ‘‘‘branches’’’. | |||
| 00:15 | Na bynta kane ka tutorial, Nga pyndonkam ka: | Ubuntu Linux 14.04 | Git 2.3.2 bad | gedit Text Editor. |
| 00:25 | Phi lah ban pyndonkam uno uno u editor uba phi kwah. | |||
| 00:29 | Ban bud ïa kane ka tutorial, phi dei ban don ka jingtip ban run ïaki Linux commands ha u Terminal. | |||
| 00:36 | Lada em, na bynta ka Linux tutorial ba kum kane sngewbha leit shaka website jong ngi. | |||
| 00:42 | To ngin pule shaphang ka branching. | |||
| 00:44 | haka jingshisha ïaka, branches la pyndonkam haki project ban thaw ïaka module ba thymmai lane ban fix ïa ka bug. | |||
| 00:52 | Ka ïarap ban treikam haka project ba thymmai khlem da pynthut ïaka main project. | |||
| 00:58 | ka default branch jong ka Git kadei master. | |||
| 01:02 | Ngi pyndonkam ki branches bapher bapher ban thaw ïaki module ba thymmai. | |||
| 01:06 | bad ynsa pyndait lang bad ka master branch hadien. | |||
| 01:11 | Kum ka nuksa, kane ka dur ka pyni ïaka repository ryngkat ka master bad new-module branches. | |||
| 01:18 | KI don katto katne ki commits ba kyrteng C1, C2 bad C3 haka master branch. | |||
| 01:25 | Nangta la shna ïaka branch 'new-module' haka C3 commit. | |||
| 01:30 | C4, C5 bad C8 ki dei ki commits jong ka new-module branch. | |||
| 01:36 | Ha kajuh ka por, la shna ïaki commits C6 bad C7 haka master branch. | |||
| 01:43 | Hangne, phi lah ban iohi ba ka new-module branch kam pynthut ïaka master branch. | |||
| 01:49 | Shisien ba ka new-module ka la long, ngin thep lang biang ïaka bad ka master branch. | |||
| 01:55 | Ha kane ka tutorial, ngan pyni nuksa kumno ka branch ka treikam. Ngin sa ïa peit ïaka Merging haka tutorial babud. | |||
| 02:03 | ñion Ctrl+Alt+T ban plie ïa u terminal. | |||
| 02:07 | Ngin plie ïa ka Git repository mywebpage jong ngi kaba ngi la shna hashwa. | |||
| 02:13 | Type: cd space mywebpage bad ñion Enter. | |||
| 02:19 | Ngan bteng ban pyndonkam ïa ki file html na bynta ban pyni nuksa. Phi lah ban pyndonkam kano kano ka file kaba phi kwah. | |||
| 02:28 | To ngin check ïaka Git log dakaba type git space log space hyphen hyphen oneline bad ñion Enter | |||
| 02:37 | Nyngkong, ngin check lada ngi don kano kano ka branch haka repository. | |||
| 02:43 | Type: git space branch bad ñion Enter. | |||
| 02:48 | Ka pyni ïaka default branch 'master', kumba la batai mynne. | |||
| 02:53 | Shubuh mynta, nga kwah ban shna ïaka branch ba kyrteng "new-chapter". | |||
| 02:57 | Type: git space branch space new-chapter bad ñion Enter. | |||
| 03:04 | To ngin peit ïaka branch list dakaba type git space branch bad ñion Enter. | |||
| 03:12 | Ngi lah ban iohi hangne ïaka branch "new-chapter" haka list. | |||
| 03:16 | Ngi lah ruh ban iohi ïa u symbol asterisk bad ka master branch. | |||
| 03:20 | Ka kdew ba mynta ngi dang trei kam ha ka master branch. | |||
| 03:25 | Ban leit sha ka "new-chapter" branch, type: git space checkout space new-chapter bad ñion Enter. | |||
| 03:36 | Ban check ïaka branch name, type: git space branch bad ñion Enter. | |||
| 03:42 | Da kaba iohi ïa u asterisk, ngi lah ban sngewthuh ba mynta ngi don haka "new-chapter" branch. | |||
| 03:49 | Nangta, ngan shna ïaka html file story.html bad commit ïaka tang ban pyni nuksa. | |||
| 03:57 | Type: gedit space story.html space ampersand bad ñion Enter. | |||
| 04:05 | Ngan copy bad paste katto katne ki code sha kane ka file, naka Writer document jong nga kaba nga la save hashwa. | |||
| 04:12 | Save bad close ïaka file. | |||
| 04:15 | Kynmaw ba ngi dei ban commit ïaka kam jong ngi haman ba ngi thep lane weng ïa kano kano ka file. | |||
| 04:21 | Ban thep ïaka file sha ka staging area, type: git space add space story.html bad ñion Enter. | |||
| 04:31 | Ban commit ïaka kam jong ngi, type: git space commit space hyphen m space hapoh ki double quotes “Added story.html in new-chapter branch” bad ñion Enter. | |||
| 04:47 | To ngin check ïaka Git log jong ka "new-chapter" branch dakaba type git space log space hyphen hyphen oneline bad ñion Enter. | |||
| 04:57 | Ngi lah ban iohi hangne ïa ka commit ba thymmai tam jong ngi ka “Added story.html in new-chapter branch”. | |||
| 05:04 | Lehse mynta ngi kwah ban leit phai pat sha ka kam jong ngi ka master branch ban leh katto katne ki kam. | |||
| 05:10 | Te, ngin type: git space checkout space master bad ñion Enter. | |||
| 05:18 | Ban check ïaka Git log, type: git space log space hyphen hyphen oneline bad ñion Enter. | |||
| 05:27 | Ngi lah ban ïohi Hangne ïaka , commit “Added story.html in new-chapter branch”. | |||
| 05:34 | Kane ka long namar ba kato ka commit ka long tang jong ka "new-chapter" branch. | |||
| 05:39 | To ngin check ia ka folder content dakaba type ls bad ñion Enter. | |||
| 05:45 | Ngim iohi hangne ïaka file story.html. | |||
| 05:49 | Kaba bud, ngin pynkylla katto katne ïaka file history.html. | |||
| 05:55 | To ngin plie ïaka file dakaba type gedit space history.html space ampersand bad ñion Enter. | |||
| 06:05 | To ngin thep katto katne ki laiñ. | |||
| 06:08 | Save bad close ïaka file. | |||
| 06:10 | To ngin commit ïaka kam jong ngi hakane ka por dakaba type git space commit space hyphen am space hapoh ki double quotes “Added chapter two in history.html” bad ñion Enter. | |||
| 06:26 | Haduh mynta, ngi dang treikam bad ka master branch. | |||
| 06:30 | Mynta to ngin check lada kane ka commit ka paw ne em haka new-chapter branch. | |||
| 06:36 | Ban leit shapoh ka new-chapter branch, type: git space checkout space new-chapter bad ñion Enter. | |||
| 06:46 | To ngin check ïaka Git log dakaba type git space log space hyphen hyphen oneline bad ñion Enter. | |||
| 06:55 | Ngim lah ban iohi hangne ba ka commit “Added chapter two in history.html” kumba long haka master branch. | |||
| 07:04 | To ngin thep katto katne ki laiñ sha ka file jong ngi ka story.html. Type: gedit space story.html space ampersand bad ñion Enter. | |||
| 07:16 | Ngan thep katto katne ki laiñ naka Writer document jong nga. | |||
| 07:20 | Save bad close ïaka file. | |||
| 07:22 | Ban check ïaka Git status, type: git space status bad ñion Enter. | |||
| 07:29 | Kynmaw ba ngi khlem pat committed ïaka kam jong ngi ha kane ka stage. | |||
| 07:33 | Phi pyrkhat kan jia aiu lada ngi pyrshang ban switch branch khlem pat leh committing? Kane kan lam sha ka error. | |||
| 07:41 | To ngin pyrshang ban leit phai pat sha ka master branch. Type: git space checkout space master bad ñion Enter. | |||
| 07:51 | Kane ka error ka pyni ba ngin ym lah ban switch biang sha kiwei ki branches khlem pat committing ïaki jingkylla. | |||
| 07:59 | Hynrei, kumno lada ngam kwah ban commit ïaki jingkylla, namar kim long kiba kongsan ha kane ka stage? Ïa kane lah ban leh dakaba pyndonkam ka stashing. | |||
| 08:08 | Ngin sa pule shaphang ka stashing ha ki tutorial ban wan. | |||
| 08:13 | Ia mynta, ngin exit jubor iakane ka branch dakaba pyndonkam ka hyphen hyphen force flag. | |||
| 08:19 | Type: git space checkout space hyphen hyphen force space master bad ñion Enter. | |||
| 08:28 | Ngin leit biang Sa shisien sha ka new-chapter branch, ban check lada la kyntait ne em ïaki jingkylla. | |||
| 08:36 | Type: git space checkout space new-chapter bad ñion Enter. | |||
| 08:42 | To ngin plie ïaka file story.html dakaba type gedit space story.html space ampersand bad ñion Enter. | |||
| 08:54 | Ngi lah ban iohi hangne ba ïaki jingpynkylla jong ngi lah kyntait. To ngin khang noh ïaka gedit. | |||
| 09:01 | Ngin sa pule ban merge ïa kane ka new-chapter branch bad ka master branch haki tutorial ba bud. | |||
| 09:07 | Da kane, ngi lahpoi sha kaba kut jong kane ka tutorial. | |||
| 09:11 | To ngin batai lyngkot. Ha kane ka tutorial, ngi la pule shaphang:
Branching, ban shna ka branch bad Ban Switch hapdeng ki master branch and the new branch | |||
| 09:23 | Kum ka assignment- Shna ka branch ba kyrteng "chapter-two". | |||
| 09:28 | Leit sha ka chapter-two branch. | |||
| 09:31 | Leh katto katne ki commits. | |||
| 09:33 | Switch biang sha ka master branch. | |||
| 09:36 | Check ïaka Git log bad sngewthuh ba, haka master branch, phin ym iohi ïaki commits jong ka "branch chapter-two". | |||
| 09:44 | Ka video badon haka link harum, Ka batai lyngkot ïaka Spoken Tutorial project sngewbha download bad peit ïaka. | |||
| 09:52 | Ka Spoken Tutorial Project team Ka pynlong workshops bad Ka ai certificates sha kito kiba pass ïaka on-line test. | |||
| 09:59 | Ban tip kham bniah, sngewbha thoh sha ngi. | |||
| 10:03 | ïaka Spoken Tutorial Project la bei tyngka daka NMEICT, MHRD, Sorkar India. Khambun ka jingtip halor kane ka mission kadon ha ka link harum. | |||
| 10:15 | ïa kane ka script la pynkylla sha ka ktien Khasi da I Hezekiah Lyngdoh na Shillong.
Khublei ba phi la ïasnohlang. |
