lemaslab / lemaslab.github.io

The LemasLab website at the University of Florida
https://lemaslab.github.io/
1 stars 39 forks source link

possible fix of local debug #113

Closed e-elias closed 2 years ago

XinsongDu commented 2 years ago

Greetings @e-elias , great job on fixing this issue. However, it seems there is a conflict and I couldn't approve the pull request. Conflicts is usually produced due to not pull (or merge master branch back to your own branch) before making changes. So, I will close this pull request.

To resolve the conflict, I recommend the following steps:

  1. Make a backup of your updated Gemfile.lock on your local machine.
  2. Cancel your change on your branch.
  3. Merge master branch to your branch.
  4. Update the Gemfile.lock using your backup file and push to GitHub.
  5. Make a pull request to master branch and wait for review.

Please let me know if you have any questions or need to schedule a meeting to move this forward. Keep up great work!