Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions 1. Overview.md
Original file line number Diff line number Diff line change
@@ -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
34 changes: 34 additions & 0 deletions 2. Workflow.md
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ Output
simple interest = p*t*r
```

bug-fix-typo
_© 2022 XYZ, Inc._
Loading