Skip to content

Assignment completed April 11#2

Open
reearmed wants to merge 12 commits intomainfrom
assignment
Open

Assignment completed April 11#2
reearmed wants to merge 12 commits intomainfrom
assignment

Conversation

@reearmed
Copy link
Owner

What changes are you trying to make? (e.g. Adding or removing code, refactoring existing code, adding reports)

What did you learn from the changes you have made?

Was there another approach you were thinking about making? If so, what approach(es) were you thinking of?

Were there any challenges? If so, what issue(s) did you face? How did you overcome it?

How were these changes tested?

A reference to a related issue in your repository (if applicable)

Checklist

  • I can confirm that my changes are working as intended

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status comment
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4 Missing directories: data/processed/server_logs, data/processed/user_logs, data/processed/event_logs
Part 1 - Q5 Missing files in data/processed/server_logs
Part 1 - Q6 Missing files in data/processed/user_logs; Missing files in data/processed/event_logs
Part 1 - Q7
Part 1 - Q8
Part 2 coworker-changes branch not found in commit history

Please address the issues listed above.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status comment
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4
Part 1 - Q5
Part 1 - Q6
Part 1 - Q7 One or more files with ipaddr in data/processed/user_logs not removed
Part 1 - Q8
Part 2 coworker-changes branch not found in commit history

Please address the issues listed above.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status comment
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4
Part 1 - Q5
Part 1 - Q6
Part 1 - Q7
Part 1 - Q8
Part 2 coworker-changes branch not found in commit history

Please address the issues listed above.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status comment
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4
Part 1 - Q5
Part 1 - Q6
Part 1 - Q7
Part 1 - Q8
Part 2 coworker-changes branch not found in commit history

Please address the issues listed above.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status comment
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4
Part 1 - Q5
Part 1 - Q6
Part 1 - Q7
Part 1 - Q8
Part 2 coworker-changes branch not found in commit history

Please address the issues listed above.

@dtxe
Copy link

dtxe commented Apr 14, 2025

The autograder cannot find the commits from merging coworker-changes because they have already been merged into your main branch. To fix this:

Restore the main branch to match the UofT-DSI repo

  1. cd <your repo path>
  2. git remote add upstream https://github.com/UofT-DSI/shell
    • Add the UofT-DSI repo as a remote named "upstream"
  3. git fetch upstream
    • Download the UofT-DSI repo into the git database locally
  4. git switch -C main upstream/main
    • the Capital -C forcibly recreates your main branch based on upstream/main
  5. git push --force --set-upstream origin main
    • Forcibly overwrite your main branch with the contents from upstream/main
  6. Check your repo on GitHub.com to verify that the main branch has been restored (eg. assignment.sh is blank, commit ID matches UofT-DSI/shell, etc..)

Re-run the autograder by re-opening the pull request

  1. On GitHub.com, close your current pull request from main <= assignment
  2. Re-open the pull request for main <= assignment

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autograder results

question status
Part 1 - Q1
Part 1 - Q2
Part 1 - Q3
Part 1 - Q4
Part 1 - Q5
Part 1 - Q6
Part 1 - Q7
Part 1 - Q8
Part 2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants