organicmaps/website
13
Fork 1
Code Issues 31 Pull requests 8 Projects Releases Wiki Activity Actions

WIP: Test new Inter font #165

Draft
biodranik wants to merge 1 commit from ab-new-font into master
pull from: ab-new-font
merge into: organicmaps:master
Conversation 1 Commits 1 Files changed 2 +4
biodranik commented 2023-08-22 19:19:26 +00:00 (Migrated from github.com)
Copy link
No description provided.
cloudflare-workers-and-pages[bot] commented 2023-08-22 19:19:52 +00:00 (Migrated from github.com)
Copy link

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: cb26972
Status: ✅  Deploy successful!
Preview URL: https://2634212b.organicmaps.pages.dev
Branch Preview URL: https://ab-new-font.organicmaps.pages.dev

View logs

## Deploying with &nbsp;<a href="https://pages.dev"><img alt="Cloudflare Pages" src="https://user-images.githubusercontent.com/23264/106598434-9e719e00-654f-11eb-9e59-6167043cfa01.png" width="16"></a> &nbsp;Cloudflare Pages <table><tr><td><strong>Latest commit:</strong> </td><td> <code>cb26972</code> </td></tr> <tr><td><strong>Status:</strong></td><td>&nbsp;✅&nbsp; Deploy successful!</td></tr> <tr><td><strong>Preview URL:</strong></td><td> <a href='https://2634212b.organicmaps.pages.dev'>https://2634212b.organicmaps.pages.dev</a> </td></tr> <tr><td><strong>Branch Preview URL:</strong></td><td> <a href='https://ab-new-font.organicmaps.pages.dev'>https://ab-new-font.organicmaps.pages.dev</a> </td></tr> </table> [View logs](https://dash.cloudflare.com/?to=/:account/pages/view/organicmaps/2634212b-45b0-4e86-84cc-f659380c68be)
This pull request has changes conflicting with the target branch.
  • templates/base.html
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin ab-new-font:ab-new-font
git checkout ab-new-font

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 checkout master
git merge --no-ff ab-new-font
git checkout ab-new-font
git rebase master
git checkout master
git merge --ff-only ab-new-font
git checkout ab-new-font
git rebase master
git checkout master
git merge --no-ff ab-new-font
git checkout master
git merge --squash ab-new-font
git checkout master
git merge --ff-only ab-new-font
git checkout master
git merge ab-new-font
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
about page

About Page of the website

  
bug

Something isn't working

  
community page

Community Page of the website

  
documentation

Improvements or additions to documentation

  
donate page

Donate Page of the website

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
feature page

Feature Page of the website

  
good first issue

Good for newcomers

  
Google Season of Docs

Google Season of Docs

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
landing page

Landing Page of website

  
news page

News Page of the website

  
question

Further information is requested

  
support page

Support Page of the website

  
wontfix

This will not be worked on

No labels
about page
bug
community page
documentation
donate page
duplicate
enhancement
feature page
good first issue
Google Season of Docs
help wanted
invalid
landing page
news page
question
support page
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: organicmaps/website#165
No description provided.
Delete branch "ab-new-font"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?