ecc-wtf-web-dev

These are the materials for my web development course at ECC for workforce development

Useful filesystem commands

Note Always try to use tab whenever possible, it saves on spelling errors and helps you move faster

• pwd: Print Working Directory tells you where in the filesystem you are
• cd: change directory
  • cd ../ will put you into the parent directory (up a level) from where you are
  • cd ~ will put you into your home directory
  • cd /some/file/path/to/some/directory will put you in to the folder path you described
• ls: list directory contents
  • ls -a lists all contents including hidden files
  • ls -l lists all files and shows information about them such as modified date and size
  • ls / will show "normal" files in your root directory
  • combining all of these you could show all files in the root, and the data about them using ls -la /
• cp: copy
  • cp -r /source/directory/name/ /destination/directory/ will copy the content of source to destination
  • cp file_1 new_file will make a copy of file_1 named new_file
• mv: moves and renames files and directories
  • mv directory1/ /some/other/directory/location/ will move the directory into the destination provided
  • mv file_name newFileName will rename file_name to newFileName
• find: find files and directories
  • find /tmp -type f -empty -delete will find all empty files in the /tmp dir and delete them

Useful git commands

Note: You have to be in a git repository (directory) to use git commands

• git status: shows you the current status including branch and file status
• git checkout branch-name: will check you out to a branch called branch-name
• git checkout -b branch-name: will create and check you out to a branch called branch-name
• git add filename: will stage the changes in filename to be committed
• git add .: will stage the changes in all files to be committed
• git commit -am "this is where you message goes": will stage and commit all files that are currently tracked by git
• git branch --merged <main-branch-name> | grep -v '<main-branch-name>$' | xargs git branch -d this allows you to safely delete all branches that have been merged into what ever branch you supply as <main-branch-name>; see the example below.
  • NOTE: I recommend adding this as an alias (vim ~/.bashrc or whereever you keep aliases) in the form of alias pruneBranches='git branch --merged "$1" | grep -v "^$1$" | xargs git branch -d'. You can then call it with pruneBranches main. This is safe for almost any git setup whether its GitHub, Bitbucket, GitLab or any others.

Git Workflow

First you need to clone the repo

git clone url cd <repository name>

Then follow the same workflow every time

1. git checkout -b <name-of-branch>
2. create and update some files
3. git status
4. git add <filename(s)>
5. git commit -m "the message that identifies what changes were made"
6. git push -u origin <name-of-branch>
7. at this point you can continue editing code and making commits and pushing those commits by repeating steps 2-5 and running git push without the -u argument
8. create a pull request
9. add a reviewer to the pull request
10. assign yourself to the pull request
11. once approved merge the request into main/master
12. git checkout main/master
13. git pull -p

If you get a conflict

1. git checkout <master-branch-name>
2. git pull -p
3. git checkout <feature/bugfix branch>
4. git merge <master branch name>
5. resolve conflicts
6. git add <filename(s) of fixed file(s)>
7. git merge --continue
8. git push

Helpful Links

• PHP.net PHP reference
• W3 Schools CSS HTML JS reference
• Linking prs to issues in github
• Bootstrap Docs