From 4f9b03aaf9917c2f0620e7d16313ca9630f7448e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Sun, 18 Oct 2020 11:08:25 +0200
Subject: [PATCH] remove github and merge fork part
---
docs/README.md | 16 ++++++++++++----
docs/_sidebar.md | 2 --
docs/remote/2_github.md | 10 ----------
3 files changed, 12 insertions(+), 16 deletions(-)
delete mode 100644 docs/remote/2_github.md
diff --git a/docs/README.md b/docs/README.md
index 6d8231d..08c17e4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -20,13 +20,21 @@
- [VĂĄltoztatĂĄsok mentĂŠse](workshop/2_basics.md?id=vĂĄltoztatĂĄsok-mentĂŠse)
- [FĂĄjlok mozgatĂĄsa](workshop/2_basics.md?id=fĂĄjlok-mozgatĂĄsa)
- [MentĂŠsi elĹzmĂŠnyek](workshop/2_basics.md?id=mentĂŠsi-elĹzmĂŠnyek)
- - [Branch-ek, elĂĄgazĂĄs](workshop/3_branch.md)
+ - [Branch-ek, elĂĄgazĂĄs](workshop/3_branch.md?id=branch-ek-elĂĄgazĂĄs)
+ - [Mik azok a branch-ek?](workshop/3_branch.md?id=mik-azok-a-branch-ek)
+ - [Hogy ĂŠpĂźl fel?](workshop/3_branch.md?id=hogy-ĂŠpĂźl-fel)
+ - [Ăgak kĂśzti mozgĂĄs](workshop/3_branch.md?id=Ăgak-kĂśzti-mozgĂĄs)
+ - [MergelĂŠs](workshop/3_branch.md?id=mergelĂŠs)
+ - [Merge conflict](workshop/3_branch.md?id=merge-conlict)
- TĂĄvoli Repository
- - [Alapok, SSH kulcs](remote/1_basics.md)
- - [Github](remote/2_github.md)
- - [Issue, merge request, Fork](remote/3_issue_merge_fork.md)
+ - [Alapok ĂŠs SSH kulcs](remote/1_basics.md)
+ - [Alapok](remote/1_basics.md?id=alapok)
+ - [SSH](remote/1_basics.md?id=ssh)
+ - [SajĂĄt SSH kulcs](remote/1_basics.md?id=sajĂĄt-ssh-kulcs)
+ - [Linuxon / MacOS-en](remote/1_basics.md?id=linuxon-macos-en)
+ - [Windowson](remote/1_basics.md?id=windowson)
- ForrĂĄs
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 262b9a8..6b5401a 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -35,8 +35,6 @@
- [SajĂĄt SSH kulcs](remote/1_basics.md?id=sajĂĄt-ssh-kulcs)
- [Linuxon / MacOS-en](remote/1_basics.md?id=linuxon-macos-en)
- [Windowson](remote/1_basics.md?id=windowson)
- - [Github](remote/2_github.md)
- - [Issue, merge request, Fork](remote/3_issue_merge_fork.md)
- ForrĂĄs
diff --git a/docs/remote/2_github.md b/docs/remote/2_github.md
deleted file mode 100644
index 3d6a3b7..0000000
--- a/docs/remote/2_github.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Github
-
-TODO kĂŠpek, hasonlĂłkkal valĂł
-vĂŠgigvezetĂŠs a felĂźlet lĂŠnyegein.
-
-Ezek mellett forkolĂĄs, merge request kĂŠszĂtĂŠse.
-
-VĂŠgĂźl workshopban lesz cicĂĄs repo
-
-[ElĹzĹ](remote/1_basics?id=alapok-ĂŠs-ssh-kulcs)
--
GitLab