search

metallum-ultorum / metallum-ultorum.github.io

Our custom website!
http://metallum-ultorum.github.io/
0 stars 0 forks source link

Changes # 11/7/24 #1

Closed Sunny0734 closed 2 days ago

Sunny0734 commented 6 days ago

Added a back-to-top button on both mobile view and laptop view. Adjusted the hamburger on mobile view and formatted all the code.

bboonstra commented 5 days ago

Resolve your conflicts

Sunny0734 commented 5 days ago

What should i do? What do you mean by conflicts bro?

On Sat, Nov 9, 2024 at 7:12 PM Ben @.***> wrote:

Resolve your conflicts

— Reply to this email directly, view it on GitHub https://github.com/metallum-ultorum/metallum-ultorum.github.io/pull/1#issuecomment-2466533815, or unsubscribe https://github.com/notifications/unsubscribe-auth/BBGZWBKTOOJJDST4SUNXQXDZ72XJTAVCNFSM6AAAAABROTILD6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINRWGUZTGOBRGU . You are receiving this because you authored the thread.Message ID: @.*** com>

bboonstra commented 5 days ago

Screenshot 2024-11-09 at 7 46 56 PM

bboonstra commented 5 days ago

Are you unable to see this? You can also try

Step 1: Clone the repository or update your local repository with the latest changes.

git pull origin main Step 2: Switch to the head branch of the pull request.

git checkout 'changes-#-11/7/24' Step 3: Merge the base branch into the head branch.

git merge main Step 4: Fix the conflicts and commit the result.

See Resolving a merge conflict using the command line for step-by-step instructions on resolving merge conflicts. Step 5: Push the changes.

git push -u origin 'changes-#-11/7/24'