How to resolve Git merge conflicts
How to resolve Git merge conflicts agantony Tue, 04/04/2023 – 03:00 Suppose you and I are working on the same file called index.html. I make some changes to the file, commit them, and push the changes to the remote Git repository. You also make some changes to the same file, commit them, and start pushing the changes to the same Git repository. However, Git detects a conflict because the changes you made conflict with the...
Handle any type of document with this open source tool
Handle any type of document with this open source tool hej Mon, 04/03/2023 – 03:00 Collabora Online supports all sorts of files and formats. How does this open source office suite do in terms of interoperability, though? This article takes a closer look at Collabora Online’s ability to exchange complex text documents and spreadsheets with different office suites such as Microsoft 365 and Google Workspace. Collabora Online...
Open source text editing for your website with CKEditor
Open source text editing for your website with CKEditor AnnaTomanek Mon, 04/03/2023 – 03:00 Most applications allow users to create and add some textual content, such as a comment, a chat message, an article, a product description, or a legal document. Today, plain text isn’t enough. Users format text, insert images and memes, videos, tables, and create lists and links. A developer can probably craft this rich content in...
Using mocks in Python
Using mocks in Python Moshe Zadka Sat, 04/01/2023 – 03:00 April 1st is all about fake stories and pretending. This makes it the perfect day to talk about mocking. Sometimes, using real objects is hard, ill-advised, or complicated. For example, a requests.Session connects to real websites. Using it in your unittests invites a…lot…of problems. Basic mocking in Python “Mocks” are a unittest concept. They produce objects...
Measure pi with a Raspberry Pi
Measure pi with a Raspberry Pi Jim Hall Fri, 03/31/2023 – 03:00 March 14th is celebrated around the world as Pi Day. Many people celebrate Pi Day by measuring pi with objects found around the house. I wanted to do something similar for this year’s Pi Day using my Raspberry Pi 3B. Read on to learn how I measured pi using my Raspberry Pi. What you’ll need: Raspberry Pi single-board computer Graph paper Ruler with mm...
3 reasons my Linux team uses Penpot
3 reasons my Linux team uses Penpot ekidney Thu, 03/30/2023 – 03:00 Working with Fedora exposes you to a lot of different open source software. A major Fedora website revamp started over a year ago, with the goal of improving design aesthetics, creating a style guide, planning the website strategy, and choosing the tech stack for delivering the Fedora Linux offerings website. From a design perspective, the team needed a tool to...
