# SE475 Design Journal - Week 2 (2020/09/18)
### Things I worked on
- Assignment 2 (Completed)
- Setting up GUI tool (Github Desktop)
- Using essential git commands
- Working with multiple branches

### Things I learned
#### Github Desktop
Since I have already set up git last week, I only had to set up the GUI tool for git this week. I choose Github Desktop simply because it is made by Github. The setup process was pretty smooth. I noticed that it would dynamically display some suggested actions like add/commit for current progress or create PR after changes in another branch is made. I can imagine that it would very useful and intuitive for people who are not very used to terminal (like me).

#### Git commands
Apart from the ```git add```, ```git commit``` and ```git push``` commands, I got to practice how to use ```git branch``` and ```git checkout``` to jump between branches and commits. For recovering a deleted file, I chose to call ```git revert``` on the commit that deleted the file. I merged the file with Github's pull request and merge, and since I changed the same part of the code in two branches, I had to manually resolve the conflit before merging, which was also a very good practice.

#### Git branches
This assignment was actually the first time that I have created and made changes in a new branch. The experience was pretty fun. At some point I was constantly switching between branches just to appreciate how changes were stored across branches.