ryg/rmarchiv
1
0
Fork 0
Code Issues 39 Pull requests 7 Projects Releases Packages Wiki Activity Actions

Fix logos not being displayed #327

Open
Ghabry wants to merge 1 commit from Ghabry/bugfix/logo into master
pull from: Ghabry/bugfix/logo
merge into: ryg:master
Conversation 0 Commits 1 Files changed 2 +3 -2
Ghabry commented 2022-09-13 11:17:15 +02:00 (Migrated from github.com)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • resources/views/_partials/header.blade.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Ghabry/bugfix/logo:Ghabry/bugfix/logo
git switch Ghabry/bugfix/logo

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff Ghabry/bugfix/logo
git switch Ghabry/bugfix/logo
git rebase master
git switch master
git merge --ff-only Ghabry/bugfix/logo
git switch Ghabry/bugfix/logo
git rebase master
git switch master
git merge --no-ff Ghabry/bugfix/logo
git switch master
git merge --squash Ghabry/bugfix/logo
git switch master
git merge --ff-only Ghabry/bugfix/logo
git switch master
git merge Ghabry/bugfix/logo
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
dependencies

Pull requests that update a dependency file

  
duplicate

   
enhancement

   
help wanted

   
in progress

   
invalid

   
javascript

Pull requests that update Javascript code

  
question

   
ready

   
todo: asap

   
todo: far

   
todo: mid

   
todo: short

   
wontfix
No labels
bug
dependencies
duplicate
enhancement
help wanted
in progress
invalid
javascript
question
ready
todo: asap
todo: far
todo: mid
todo: short
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ryg/rmarchiv!327
No description provided.