From 7504553e1ad287441738cafd7d036b1ac6ea5d63 Mon Sep 17 00:00:00 2001 From: Sarah M Brown Date: Tue, 17 Sep 2024 22:15:14 -0400 Subject: [PATCH] questions --- notes/2024-09-17.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/notes/2024-09-17.md b/notes/2024-09-17.md index 1956291..da7026f 100644 --- a/notes/2024-09-17.md +++ b/notes/2024-09-17.md @@ -1247,4 +1247,32 @@ To https://github.com/compsys-progtools/gh-inclass-brownsarahm.git ## Experience Report Evidence -## Questions After Today's Class \ No newline at end of file +## Questions After Today's Class + +### How do I know if everything I submitted was done properly, or see a grade of somesort. I know comments are left but sometimes when I check I don't really know if I did everything right. + +If it's approved you completed the badge, if revisions are requested, then you need to revise. + +Starting next week, we will learn how to produce a progress report. + +### Why wouldnt you just use vs code or git hub directly? + +Using the terminal is generally faster once you learn it. It also allows you to write scripts. + +Some things cannot be done in browser, plus when you are writing code you would be working outside of the browser. + +### How common are merging issues? + +Merge conflicts are very common. It happens whenever a branch is edited in two places. + +### How can I merge the new branch locally, not from the website? + +the `git merge` command + +### Is it possible to have more than one merge conflict on a line? + +on a single line it will count it as a single conflict, because it counts by lines + +### What is the order of merge and rebase? + +THey are two options for the same thing, but they put commits in a different order. \ No newline at end of file