{"id":1383,"date":"2026-01-25T07:25:27","date_gmt":"2026-01-25T07:25:27","guid":{"rendered":"https:\/\/gurututorku.com\/blog\/?p=1383"},"modified":"2026-01-29T07:34:09","modified_gmt":"2026-01-29T07:34:09","slug":"tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge","status":"publish","type":"post","link":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/","title":{"rendered":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi &#8211; Branch, Conflict, Merge)"},"content":{"rendered":"\n<h1 class=\"wp-block-heading\">Materi GitHub Kolaborasi (2\u20133 Orang)<\/h1>\n\n\n\n<h3 class=\"wp-block-heading\">Studi Kasus: Proyek Website Sekolah<\/h3>\n\n\n\n<h2 class=\"wp-block-heading\">Tujuan Pembelajaran<\/h2>\n\n\n\n<p>Setelah mempelajari materi ini, peserta mampu:<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>Bekerja kolaborasi menggunakan GitHub<\/li>\n\n\n\n<li>Membuat dan menggunakan branch masing-masing<\/li>\n\n\n\n<li>Push &amp; pull perubahan kode<\/li>\n\n\n\n<li>Mengatasi <strong>merge conflict<\/strong><\/li>\n\n\n\n<li>Melakukan <strong>merge ke branch utama<\/strong><\/li>\n\n\n\n<li>Bekerja tim dalam proyek website sekolah<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">Pembagian Peran Tim (Contoh 3 Orang)<\/h2>\n\n\n\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>Nama<\/th><th>Peran<\/th><\/tr><\/thead><tbody><tr><td>Anggota 1<\/td><td><strong>Repository Owner \/ Leader<\/strong><\/td><\/tr><tr><td>Anggota 2<\/td><td>Frontend Developer<\/td><\/tr><tr><td>Anggota 3<\/td><td>Content \/ Page Developer<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p><em>Jika hanya 2 orang, Anggota 2 &amp; 3 bisa digabung perannya.<\/em><\/p>\n<\/blockquote>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">Studi Kasus Proyek<\/h2>\n\n\n\n<p>Membuat <strong>Website Sekolah Sederhana<\/strong> dengan halaman:<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>index.html<\/code> (Beranda)<\/li>\n\n\n\n<li><code>profil.html<\/code> (Profil Sekolah)<\/li>\n\n\n\n<li><code>kontak.html<\/code> (Kontak)<\/li>\n\n\n\n<li><code>style.css<\/code><\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h1 class=\"wp-block-heading\">STEP 1 \u2013 Menentukan Repository Owner<\/h1>\n\n\n\n<p><strong>Anggota 1 (Leader)<\/strong><\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>Login ke GitHub<\/li>\n\n\n\n<li>Klik <strong>New Repository<\/strong><\/li>\n\n\n\n<li>Isi:\n<ul class=\"wp-block-list\">\n<li>Repository name: <code>website-sekolah<\/code><\/li>\n\n\n\n<li>Public<\/li>\n\n\n\n<li>Add README<\/li>\n<\/ul>\n<\/li>\n\n\n\n<li>Klik <strong>Create Repository<\/strong><\/li>\n<\/ol>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h1 class=\"wp-block-heading\">STEP 2 \u2013 Clone Repository ke Laptop<\/h1>\n\n\n\n<p><strong>Semua Anggota<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git clone https:\/\/github.com\/username\/website-sekolah.git\ncd website-sekolah\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h1 class=\"wp-block-heading\">STEP 3 \u2013 Leader Menambahkan Kolaborator<\/h1>\n\n\n\n<figure class=\"wp-block-image size-large\"><img fetchpriority=\"high\" decoding=\"async\" width=\"1024\" height=\"469\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png\" alt=\"\" class=\"wp-image-1386\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-300x137.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-768x352.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1536x703.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p><strong>Anggota 1<\/strong><\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>Masuk repo \u2192 <strong>Settings<\/strong><\/li>\n\n\n\n<li>Klik <strong>Collaborators<\/strong><\/li>\n\n\n\n<li>Tambahkan username GitHub Anggota 2 &amp; 3<\/li>\n\n\n\n<li>Mereka <strong>Accept Invitation<\/strong><\/li>\n<\/ol>\n\n\n\n<p>Berikut tampilan collaborators, klik add people dan cari username teman\/anggota tim<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img decoding=\"async\" width=\"1024\" height=\"469\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM-1024x469.png\" alt=\"\" class=\"wp-image-1389\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM-1024x469.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM-300x137.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM-768x352.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM-1536x703.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Manage-access-01-27-2026_07_14_AM.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p>Setelah itu cek email masing-masing, dan klik link email tersebut untuk masuk tampilan accept invitation<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img decoding=\"async\" width=\"1024\" height=\"492\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM-1024x492.png\" alt=\"\" class=\"wp-image-1390\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM-1024x492.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM-300x144.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM-768x369.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM-1536x738.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-invited-you-to-engkuskusnadi-kolaborasi-pertama-gurututorku-gmail-com-Gmail-01-27-2026_07_16_AM.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p>klik tombol accept invitation dan selamat anda sudah berhasil bergabung ke repository owner\/leader anda<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"492\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM-1024x492.png\" alt=\"\" class=\"wp-image-1391\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM-1024x492.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM-300x144.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM-768x369.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM-1536x738.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Invitation-to-join-engkuskusnadi-kolaborasi-pertama-01-27-2026_07_16_AM.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h1 class=\"wp-block-heading\">STEP 4 \u2013 Membuat Branch Masing-masing<\/h1>\n\n\n\n<p><strong>Setiap Anggota<\/strong><\/p>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 1 (Leader)<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -b leader\n<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-large\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"576\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39-1024x576.png\" alt=\"\" class=\"wp-image-1393\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39-1024x576.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39-300x169.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39-768x432.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39-1536x864.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-39.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 2<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -b frontend\n<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 3<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -b konten\n<\/code><\/pre>\n\n\n\n<p>Cek branch:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git branch\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h1 class=\"wp-block-heading\">STEP 5 \u2013 Membuat Struktur Awal (Leader)<\/h1>\n\n\n\n<p><strong>Anggota 1<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>touch index.html profil.html kontak.html style.css\n<\/code><\/pre>\n\n\n\n<p>Commit &amp; push:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git add .\ngit commit -m \"Inisialisasi struktur website sekolah\"\ngit push origin leader\n<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-large\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"576\" src=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40-1024x576.png\" alt=\"\" class=\"wp-image-1395\" srcset=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40-1024x576.png 1024w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40-300x169.png 300w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40-768x432.png 768w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40-1536x864.png 1536w, https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/Screenshot-40.png 1920w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 6 \u2013 Sinkronisasi Repository (WAJIB)<\/h2>\n\n\n\n<p><strong>SEMUA ANGGOTA (di branch masing-masing)<\/strong><\/p>\n\n\n\n<p>&#x26a0;&#xfe0f; <strong>Aturan wajib sebelum ngoding:<\/strong><br>&#x1f449; <strong>SELALU <code>git pull<\/code> dulu sebelum edit file<\/strong><br>Supaya kode lokal kita sinkron dengan GitHub dan menghindari conflict tidak perlu.<\/p>\n\n\n\n<pre class=\"wp-block-preformatted\">git pull origin leader<\/pre>\n\n\n\n<p>kenapa kita git pull origin ke branch leader dulu ? supaya repo lokal kita sama dengan punya leader (ada file html nya)<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git add .\ngit commit -m \"update repo ke branch di github\"\ngit push origin (ketikan branch masing-masing)<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 7 \u2013 Mengerjakan File Berbeda (Aman Tanpa Conflict)<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 2 (Frontend)<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout frontend\ngit pull origin frontend\n<\/code><\/pre>\n\n\n\n<p>Edit <code>index.html<\/code>:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;h1&gt;Selamat Datang di Website Sekolah&lt;\/h1&gt;\n&lt;p&gt;Sekolah unggulan berbasis teknologi&lt;\/p&gt;\n<\/code><\/pre>\n\n\n\n<pre class=\"wp-block-code\"><code>git add index.html\ngit commit -m \"Menambahkan konten beranda\"\ngit push origin frontend\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 3 (Konten)<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout konten\ngit pull origin konten\n<\/code><\/pre>\n\n\n\n<p>Edit <code>profil.html<\/code>:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;h2&gt;Profil Sekolah&lt;\/h2&gt;\n&lt;p&gt;Sekolah berdiri sejak tahun 2000&lt;\/p&gt;\n<\/code><\/pre>\n\n\n\n<pre class=\"wp-block-code\"><code>git add profil.html\ngit commit -m \"Menambahkan profil sekolah\"\ngit push origin konten\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 8 \u2013 Sinkronisasi ke Main Sebelum Edit File yang Sama<\/h2>\n\n\n\n<p><strong>Akan mengedit file yang sama (<code>index.html<\/code>)<\/strong><\/p>\n\n\n\n<p><strong>Semua anggota WAJIB update dari <code>main<\/code><\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -b main\ngit pull origin main\n<\/code><\/pre>\n\n\n\n<p>Kembali ke branch masing-masing dan merge main:<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 2<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout frontend\ngit merge main\n<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 3<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout konten\ngit merge main\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 9 \u2013 Mengedit File yang Sama (Simulasi Conflict)<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 2<\/h3>\n\n\n\n<p>Edit <code>index.html<\/code>:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;h1&gt;Website Resmi SMA Cendikia&lt;\/h1&gt;\n<\/code><\/pre>\n\n\n\n<pre class=\"wp-block-code\"><code>git add index.html\ngit commit -m \"Update judul website\"\ngit push origin frontend\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h3 class=\"wp-block-heading\">Anggota 3<\/h3>\n\n\n\n<p>Edit <code>index.html<\/code>:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;h1&gt;Selamat Datang di SMA Cendikia Learning&lt;\/h1&gt;\n<\/code><\/pre>\n\n\n\n<pre class=\"wp-block-code\"><code>git add index.html\ngit commit -m \"Perubahan judul versi konten\"\ngit push origin konten\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 10 \u2013 Leader Pull &amp; Merge (Conflict Muncul)<\/h2>\n\n\n\n<p>&#x1f464; <strong>Anggota 1 (Leader)<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -b frontend\ngit pull origin frontend\n\ngit checkout -b konten\ngit pull origin konten\n\ngit checkout main\ngit pull origin main\n\ngit merge frontend\ngit merge konten\n<\/code><\/pre>\n\n\n\n<p>&#x1f4a5; <strong>Merge conflict terjadi di <code>index.html<\/code><\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 11 \u2013 Menyelesaikan Merge Conflict (Detail)<\/h2>\n\n\n\n<p>Buka <code>index.html<\/code>:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n&lt;h1&gt;Website Resmi SMA Cendikia&lt;\/h1&gt;\n=======\n&lt;h1&gt;Selamat Datang di SMA Cendikia Learning&lt;\/h1&gt;\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; konten\n<\/code><\/pre>\n\n\n\n<p>&#x270d;&#xfe0f; Perbaiki menjadi:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>&lt;h1&gt;Website Resmi SMA Cendikia Learning&lt;\/h1&gt;\n<\/code><\/pre>\n\n\n\n<p>Simpan lalu:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git add index.html\ngit commit -m \"Resolve conflict pada index.html\"\n<\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">STEP 12 \u2013 Push Final ke GitHub<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code>git push origin main<\/code><\/pre>\n\n\n\n<p>&#x1f389; <strong>Proyek kolaborasi berhasil dengan alur profesional<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">&#x1f9e0; CATATAN PENTING <\/h2>\n\n\n\n<p>&#x2714;&#xfe0f; <code>git pull<\/code> = ambil update terbaru<br>&#x2714;&#xfe0f; Jangan edit sebelum pull<br>&#x2714;&#xfe0f; Conflict = hal normal dalam tim<br>&#x2714;&#xfe0f; Branch = penyelamat kerja tim<br>&#x2714;&#xfe0f; Merge = penggabungan hasil kerja<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">Rangkuman Alur GitHub Kolaborasi<\/h2>\n\n\n\n<ol class=\"wp-block-list\">\n<li>Buat repository<\/li>\n\n\n\n<li>Tambah kolaborator<\/li>\n\n\n\n<li>Buat branch masing-masing<\/li>\n\n\n\n<li>Kerja terpisah<\/li>\n\n\n\n<li>Push ke GitHub<\/li>\n\n\n\n<li>Merge ke main<\/li>\n\n\n\n<li>Tangani conflict<\/li>\n\n\n\n<li>Proyek selesai <\/li>\n<\/ol>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h2 class=\"wp-block-heading\">TUGAS STUDI KASUS (UNTUK KELOMPOK)<\/h2>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p>Kerjakan secara berkelompok (2\u20133 orang)<\/p>\n<\/blockquote>\n\n\n\n<p><strong>Ketentuan:<\/strong><\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>Wajib menggunakan branch berbeda<\/li>\n\n\n\n<li>Minimal 2 file dikerjakan bersama<\/li>\n\n\n\n<li>Harus terjadi merge conflict<\/li>\n\n\n\n<li>Sertakan screenshot:\n<ul class=\"wp-block-list\">\n<li>Branch<\/li>\n\n\n\n<li>Commit history<\/li>\n\n\n\n<li>Conflict resolution<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n\n\n\n<p><strong>Output:<\/strong><\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>Link repository GitHub<\/li>\n\n\n\n<li>Website sekolah sederhana<\/li>\n<\/ul>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Materi GitHub Kolaborasi (2\u20133 Orang) Studi Kasus: Proyek Website Sekolah Tujuan Pembelajaran Setelah mempelajari materi ini, peserta mampu: Pembagian Peran Tim (Contoh 3 Orang) Nama Peran Anggota 1 Repository Owner \/ Leader Anggota 2 Frontend Developer Anggota 3 Content \/ Page Developer Jika hanya 2 orang, Anggota 2 &amp; 3 bisa digabung perannya. Studi Kasus [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[157],"tags":[180,169,172,177,178,173,176,175,174,170,171,179],"class_list":["post-1383","post","type-post","status-publish","format-standard","hentry","category-git-dan-github","tag-deploy","tag-git","tag-git-add","tag-git-branch","tag-git-colaboration","tag-git-commit","tag-git-merge","tag-git-pull","tag-git-push","tag-github","tag-repository","tag-vercel"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v23.7 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku\" \/>\n<meta property=\"og:description\" content=\"Materi GitHub Kolaborasi (2\u20133 Orang) Studi Kasus: Proyek Website Sekolah Tujuan Pembelajaran Setelah mempelajari materi ini, peserta mampu: Pembagian Peran Tim (Contoh 3 Orang) Nama Peran Anggota 1 Repository Owner \/ Leader Anggota 2 Frontend Developer Anggota 3 Content \/ Page Developer Jika hanya 2 orang, Anggota 2 &amp; 3 bisa digabung perannya. Studi Kasus [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\" \/>\n<meta property=\"og:site_name\" content=\"Gurututorku\" \/>\n<meta property=\"article:published_time\" content=\"2026-01-25T07:25:27+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2026-01-29T07:34:09+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png\" \/>\n\t<meta property=\"og:image:width\" content=\"1920\" \/>\n\t<meta property=\"og:image:height\" content=\"879\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/png\" \/>\n<meta name=\"author\" content=\"gtadmin\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"gtadmin\" \/>\n\t<meta name=\"twitter:label2\" content=\"Est. reading time\" \/>\n\t<meta name=\"twitter:data2\" content=\"4 minutes\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\"},\"author\":{\"name\":\"gtadmin\",\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2\"},\"headline\":\"Tutorial Git dan Github Bagian #4 (Github Kolaborasi &#8211; Branch, Conflict, Merge)\",\"datePublished\":\"2026-01-25T07:25:27+00:00\",\"dateModified\":\"2026-01-29T07:34:09+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\"},\"wordCount\":457,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2\"},\"image\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png\",\"keywords\":[\"deploy\",\"git\",\"git add\",\"git branch\",\"git colaboration\",\"git commit\",\"git merge\",\"git pull\",\"git push\",\"github\",\"repository\",\"vercel\"],\"articleSection\":[\"Git dan Github\"],\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\",\"url\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\",\"name\":\"Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku\",\"isPartOf\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage\"},\"image\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png\",\"datePublished\":\"2026-01-25T07:25:27+00:00\",\"dateModified\":\"2026-01-29T07:34:09+00:00\",\"breadcrumb\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage\",\"url\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png\",\"contentUrl\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png\",\"width\":1920,\"height\":879},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/gurututorku.com\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Tutorial Git dan Github Bagian #4 (Github Kolaborasi &#8211; Branch, Conflict, Merge)\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/gurututorku.com\/blog\/#website\",\"url\":\"https:\/\/gurututorku.com\/blog\/\",\"name\":\"Gurututorku - Learning today success tomorrow\",\"description\":\"Kelas dan Kursus Programming, Design, Multimedia dan Tutorial IT lainnya.\",\"publisher\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/gurututorku.com\/blog\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-US\"},{\"@type\":[\"Person\",\"Organization\"],\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2\",\"name\":\"gtadmin\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2024\/11\/cropped-gurututorku-favicon.png\",\"contentUrl\":\"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2024\/11\/cropped-gurututorku-favicon.png\",\"width\":512,\"height\":512,\"caption\":\"gtadmin\"},\"logo\":{\"@id\":\"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/image\/\"},\"sameAs\":[\"http:\/\/gurututorku.com\/blog\"],\"url\":\"https:\/\/gurututorku.com\/blog\/author\/gtadmin\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/","og_locale":"en_US","og_type":"article","og_title":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku","og_description":"Materi GitHub Kolaborasi (2\u20133 Orang) Studi Kasus: Proyek Website Sekolah Tujuan Pembelajaran Setelah mempelajari materi ini, peserta mampu: Pembagian Peran Tim (Contoh 3 Orang) Nama Peran Anggota 1 Repository Owner \/ Leader Anggota 2 Frontend Developer Anggota 3 Content \/ Page Developer Jika hanya 2 orang, Anggota 2 &amp; 3 bisa digabung perannya. Studi Kasus [&hellip;]","og_url":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/","og_site_name":"Gurututorku","article_published_time":"2026-01-25T07:25:27+00:00","article_modified_time":"2026-01-29T07:34:09+00:00","og_image":[{"width":1920,"height":879,"url":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png","type":"image\/png"}],"author":"gtadmin","twitter_card":"summary_large_image","twitter_misc":{"Written by":"gtadmin","Est. reading time":"4 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#article","isPartOf":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/"},"author":{"name":"gtadmin","@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2"},"headline":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi &#8211; Branch, Conflict, Merge)","datePublished":"2026-01-25T07:25:27+00:00","dateModified":"2026-01-29T07:34:09+00:00","mainEntityOfPage":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/"},"wordCount":457,"commentCount":0,"publisher":{"@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2"},"image":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage"},"thumbnailUrl":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png","keywords":["deploy","git","git add","git branch","git colaboration","git commit","git merge","git pull","git push","github","repository","vercel"],"articleSection":["Git dan Github"],"inLanguage":"en-US","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/","url":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/","name":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi - Branch, Conflict, Merge) - Gurututorku","isPartOf":{"@id":"https:\/\/gurututorku.com\/blog\/#website"},"primaryImageOfPage":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage"},"image":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage"},"thumbnailUrl":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM-1024x469.png","datePublished":"2026-01-25T07:25:27+00:00","dateModified":"2026-01-29T07:34:09+00:00","breadcrumb":{"@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/"]}]},{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#primaryimage","url":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png","contentUrl":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2026\/01\/engkuskusnadi-kolaborasi-pertama-01-27-2026_07_11_AM.png","width":1920,"height":879},{"@type":"BreadcrumbList","@id":"https:\/\/gurututorku.com\/blog\/tutorial-git-dan-github-bagian-4-github-kolaborasi-branch-conflict-merge\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/gurututorku.com\/blog\/"},{"@type":"ListItem","position":2,"name":"Tutorial Git dan Github Bagian #4 (Github Kolaborasi &#8211; Branch, Conflict, Merge)"}]},{"@type":"WebSite","@id":"https:\/\/gurututorku.com\/blog\/#website","url":"https:\/\/gurututorku.com\/blog\/","name":"Gurututorku - Learning today success tomorrow","description":"Kelas dan Kursus Programming, Design, Multimedia dan Tutorial IT lainnya.","publisher":{"@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/gurututorku.com\/blog\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-US"},{"@type":["Person","Organization"],"@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/6c85586545a9930343cd35e9bf4bd9a2","name":"gtadmin","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/image\/","url":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2024\/11\/cropped-gurututorku-favicon.png","contentUrl":"https:\/\/gurututorku.com\/blog\/wp-content\/uploads\/2024\/11\/cropped-gurututorku-favicon.png","width":512,"height":512,"caption":"gtadmin"},"logo":{"@id":"https:\/\/gurututorku.com\/blog\/#\/schema\/person\/image\/"},"sameAs":["http:\/\/gurututorku.com\/blog"],"url":"https:\/\/gurututorku.com\/blog\/author\/gtadmin\/"}]}},"_links":{"self":[{"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/posts\/1383","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/comments?post=1383"}],"version-history":[{"count":18,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/posts\/1383\/revisions"}],"predecessor-version":[{"id":1424,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/posts\/1383\/revisions\/1424"}],"wp:attachment":[{"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/media?parent=1383"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/categories?post=1383"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/gurututorku.com\/blog\/wp-json\/wp\/v2\/tags?post=1383"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}