search

byu-cpe / ComputingBootCamp

https://byu-cpe.github.io/ComputingBootCamp/
MIT License
7 stars 55 forks source link

Updating the schedule due to the change in weeks we're starting FPGA bootcamp #164

Closed Dumbledork01 closed 2 years ago

Dumbledork01 commented 2 years ago

I received a message today that we'd be starting FPGA bootcamp next week, so this is a revised schedule reflecting this change.

jgoeders commented 2 years ago

@JakeEdvenson Looks good, but there's a merge conflict. Can you fix it?

Dumbledork01 commented 2 years ago

It says that only those with write access to this repository can merge pull requests, so it wont let me resolve the conflicts.

jgoeders commented 2 years ago

In this case you don't resolve the conflict using github, you resolve it locally using git:

  1. Run git fetch
  2. Merge in changes from main that you are missing: git merge origin/main
  3. Resolve conflict locally.
  4. Push up changes to this branch to fix this PR.
Dumbledork01 commented 2 years ago

So, I followed these steps and the conflicts are still showing up. Any other ideas?

jgoeders commented 2 years ago

@JakeEdvenson Doesn't look like the merge got resolved properly. I see new and old entries in the table.

Dumbledork01 commented 2 years ago

The table should be fixed, I'm not sure what the errors are that are popping up now in the checks.

jgoeders commented 2 years ago

@JakeEdvenson Don't worry about the errors in the checks...but it's now showing 0 files changed. So somehow you lost your changes.

Dumbledork01 commented 2 years ago

Sorry about that! I don't know why github was giving me so much trouble on this! Thank you!