Git/C2/Merging-and-Deleting-branches/Khasi
From Script | Spoken-Tutorial
|
|
00:01 | Pdiang sngewbha sha ka spoken tutorial halor Merging and deleting branches. |
00:06 | Ha kane ka tutorial, ngin pule shaphang:Merging, |
00:10 | Phai pat naka merging bad ban delete ïaki branches. |
00:14 | Na bynta kane ka tutorial, Nga pyndonkam ka: Ubuntu Linux 14.04 |
00:20 | Git 2.3.2 bad gedit Text Editor. |
00:26 | Phi lah ban pyndonkam uno uno u editor uba phi kwah. |
00:29 | Ban bud ïa kane ka tutorial, phi dei ban ka don ka jingtip shaphang ki Git commands bad branching haka Git. |
00:37 | Lada em, na bynta ka Linux tutorial ba kum kane sngewbha leit shaka website jong ngi. |
00:42 | Mynshwa ha kane ka series, ngi la pule ban shna branches. |
00:47 | Mynta, ngin pule kumno ban merge ïaki artylli ki branches. |
00:51 | Kane ka dur ka pyni nuksa kumno baka "new-module" branch la merged bad ka "master" branch. |
00:58 | La leh ïa kane haka C9 commit. |
01:01 | Hadien ka merging, ki commits jong ka new-module la thep lang sha ka master branch. |
01:06 | To ngan batai kumno ka treikam. |
01:09 | Nyngkong, ngin plie ïaka Git repository mywebpage jong ngi kaba ngi la shna hashwa. |
01:16 | Ñion Ctrl+Alt+T ban plie ïa u terminal. |
01:20 | Ban leit sha ka Git repository jong ngi, type: cd space mywebpagebad ñion Enter. |
01:29 | Ngan bteng ban pyndonkam ïa ki file html na bynta ban pyni nuksa. |
01:33 | Phi lah ban pyndonkam kano kano ka file kaba phi kwah. |
01:38 | Nangne sha khmat, sngewbha ban kynmaw ban ñion ïa u Enter key hadien ba lahdep type kawei pa kawei ka command ha u terminal. |
01:45 | To ngin check ïaka git branch list dakaba type git space branch. |
01:51 | Ngi lah ban iohi ba ngi don artylli ki branch ba kyrteng master bad new-chapter. |
01:57 | ïaka new-chapter branch lah shna haki series kiba hashwa bad ka master ka dei ka default branch. |
02:05 | Mynta, ngi don haka master branch. |
02:08 | Ngin check ïaka Git log dakaba type git space log space hyphen hyphen oneline. |
02:17 | To ngin leit sha ka new-chapter branch bad check ïaka Git log. |
02:21 | Type: git space checkout space new-chapter |
02:27 | Type: git space log space hyphen hyphen oneline |
02:33 | Mynta, ngin ïa nujor ïa ki commits jong ka master bad ka new-chapter branches. |
02:38 | Kine saw tylli ki commits ki long kyllum ïa baroh ar tylli ki branches. |
02:42 | "Added story.html in new-chapter branch" ka don haka new-chapter branch. |
02:48 | Bad, "Added chapter two in history.html" ka don haka master branch. |
02:54 | Hadien ka merging, “Added story.html in new-chapter branch” commit yn sa thep lang sha ka master branch. |
03:02 | To ngan pyni nuksa kumno ban merge mynta. |
03:05 | Type: git space merge space master |
03:09 | Ka Gedit ka plie hi dalade ban pdiang ïaka commit message. |
03:14 | Kynmaw ba ngi lahdep configure ïaka gedit kum ka core editor jong ka Git. |
03:20 | Lada phi lah configure da kawei pat ka editor, te kata kan sa plie. |
03:26 | Lada phi pyndonkam ka Git version kaba 1.9 shapoh, te ka ‘‘‘editor’’’ ka lah ban ym plie. |
03:33 | Te, phi lah ban ïaid lait noh shaka synjam ba bud. |
03:36 | Nga pyndonkam ïaka default commit message kumba ka long. |
03:40 | Lada phi kwah ban ai da kawei pat ka message baïadei bad ka merging te type ïaka hangne. |
03:46 | Mynta save bad khang noh ïaka editor. |
03:50 | Ngin check biang ïaka Git log. |
03:54 | Phi lah ban iohi ba ka commits jong ka master branch lah pynlong lang bad ka new-chapter branch. |
04:00 | Phi lah ruh ban iohi ïaka commit message naka bynta ka merging. |
04:04 | Kaba bud, ngin leit sha ka master branch bad check ïaki commits. |
04:09 | Type: git space checkout space master |
04:14 | To ngin check ïaka Git log. |
04:17 | Hangne, ngi dei ban iohi ïaka master branch commits ryngkat bad ka new-chapter commits. |
04:22 | Hynrei, ka Git log ka pyni tang ïaka master branch commits . |
04:27 | Kumba ju dei hi, ngi lah dei ban merged ïaka new-chapter branch sha ka master branch. |
04:32 | Hynrei ngi lah merge pynban ïaka da khongpong. |
04:36 | Dei nakata ba ngim lah ban iohi ïaka merging commit haka master branch. |
04:41 | Te, kumno ngin pyn kylla biang pat ïakane ka merging? |
04:45 | Naka bynta kane, ngi donkam ban leit biang sha ka new-chapter branch. |
04:50 | Type: git space checkout space new-chapter |
04:54 | Ban pynkylla ïaka merge, type: git space reset space hyphen hyphen hard space HEAD tilde |
05:04 | Kynmaw ba ka jingpynkylla ba thymmai tam ka dei beit HEAD bad ka jingpynkylla ba thymmai tam minus 1 ka dei beit HEAD tilde. |
05:12 | Te, ngi lah pyndonkam ïaka HEAD tilde ban ioh ïaka jingpynkylla ba hashwa jong ka merging. |
05:18 | To ngin check biang ïaka Git log sa shisien. |
05:22 | Ngi lah ban iohi bala kyntait ïaka merging mynta. |
05:26 | Mynta ngin merge ïaka new-chapter branch sha ka master branch. |
05:31 | Ngin leit shwa sha ka master branch dakaba type git space checkout space master |
05:38 | To ngin check biang ïaka the Git log . |
05:42 | Ban merge, ngin type: git space merge space new-chapter. |
05:48 | Ai ïaka merging commit message jong phi haka gedit. |
05:52 | Nangta save bad khang ïaka editor. |
05:55 | check biang ïaka Git log. |
05:58 | Ngi lah ban iohi ba ka new-chapter branch jong ngi lahdep merge sha ka the master branch. |
06:05 | To ngin pyrshang ban merge biang ïaka. |
06:08 | Type: git space merge space new-chapter |
06:13 | Mynta, ngi iohi ïaka message kaba ong “Already up-to-date”. |
06:17 | Kane kadei ka rukom ba bha ban pynshisha lada ngi lahdep merge ne em ïa ka. |
06:22 | Hadien bala merging, ïaka new-chapter branch lah ban delete noh ïaka naka Git repository. |
06:28 | Ban delete ïaka branch, type: git space branch space hyphen d space new-chapter |
06:36 | To ngin check ïaka branch list sa shisien dakaba type git space branch |
06:43 | Ngim lah shuh ban iohi ïaka new-chapter branch namar ba lahdep delete ïaka. |
06:48 | Ban delete ïaka branch ba khlem merging, pyndonkam ïa u hyphen D da u dak heh haka jaka jong u hyphen d da u dak rit. |
06:56 | Da kane, ngi lahpoi sha kaba kut jong kane ka tutorial. |
07:00 | To ngin batai lyngkot |
07:02 | Ha kane ka tutorial, ngi la pule shaphang Merging, pynphai pat ïaka merging bad ban delete ïaki branches. |
07:09 | Kum ka assignment, check ïaki commits jong ka branch chapter-two kaba ngi lah shna haka assignment ba hashwa. |
07:16 | Merge ïaka bad ka master branch bad delete ïaka branch chapter-two. |
07:22 | Ka video badon haka link harum, Ka batai lyngkot ïaka Spoken Tutorial project. |
07:27 | Sngewbha download bad peit ïaka. |
07:30 | Ka Spoken Tutorial Project team Ka pynlong workshops bad Ka ai certificates sha kito kiba pass ïaka on-line test. |
07:38 | Ban tip kham bniah, sngewbha thoh sha ngi. |
07:41 | ïaka Spoken Tutorial Project la bei tyngka daka NMEICT, MHRD, Sorkar India. |
07:48 | Khambun ka jingtip halor kane ka mission kadon ha ka link harum. |
07:53 | ïa kane ka script la pynkylla sha ka ktien Khasi da I Hezekiah Lyngdoh na Shillong.
Khublei ba phi la ïasnohlang. |