diff --git a/1. Overview.md b/1. Overview.md new file mode 100644 index 0000000000..932a17c6f3 --- /dev/null +++ b/1. Overview.md @@ -0,0 +1,30 @@ +### 1. Version control + +- Helps to control work + +### 2. Github + +- Feature branching +- SSH protocol: Method to secure remote login to another computer +- Repository: Contains project folders +- Fork: Copy of a repository +- Pull request: To request for review and approval +- Working directory: Contains file and subdirectories +- Commit: Snapshot of the project's currnet state +- Branch: Separate line of development +- Merge: Conbines changes +- Clone: Local copy of the remote git repository +- The main branch should always correspond to deployable code + +### 3. Gitlab + +- A devops platform +- Collaborate +- Streamline testing and delivery with CI/CD + +### 4. Git branches + +- Main branch stores the deployable code +- Merge branch: + - 2 streams of work are ready to merge, each branch's code is identified as a tip + - Two tips are merged into a third, combined branch diff --git a/2. Workflow.md b/2. Workflow.md new file mode 100644 index 0000000000..9b927b8fca --- /dev/null +++ b/2. Workflow.md @@ -0,0 +1,34 @@ +### 1. Git workflows + +- Cloning the remote repository +- Implementing the feature +- Creating a branch +- Committing files to staging area -> commit to a branch +- Push to remote repository +- Pull request +- Merge to main branch in the remote repository + +### 2. Git commands + +- mkdir: make directory +- cd: change directory +- git init: create new directory +- git add: moves changes to staging area +- git commit -m: Svae changes with a descriptive message +- git log: brwose previous changes to a project +- git branch: create new branch +- git checkout: switch between existing branches +- git status: view the status of all changes +- git merge: merge the feature branch to the main branch +- git daemon: Used to allow anonymous download from the repository + +### 3. Cloning vs forking + +- Fork when Already have existing project, cloning otherwise + +### 4. Managing github project + +- git clone +- git pull and git fetch +- git push +- git request-pull diff --git a/README.md b/README.md index b103466139..5f397f0f3e 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,5 @@ Output simple interest = p*t*r ``` +bug-fix-typo _© 2022 XYZ, Inc._