Open-source News

Initial Support For AMD's Next-Gen, Multi-XCC CDNA Accelerator ...  Phoronix

Open-Source FaceID With RealSense  Hackaday

A currently-testing implementation of VK_EXT_fragment_shader_interlock has been published for Mesa's Radeon Vulkan "RADV" driver. This Vulkan fragment shader interlock support is used by some game emulators as well as being useful in running Direct3D 12 atop Vulkan and similar purposes...

M5Stack CM4Stack - A tiny Raspberry Pi CM4 Linux computer with ...  CNX Software

M5Stack CM4Stack – A tiny Raspberry Pi CM4 Linux computer with an integrated 2-inch display  CNX Software

Peter Hutterer, Red Hat's leading Linux input expert, today released xf86-input-libinput 1.3 as the newest version of this X.Org Server driver for making use of libinput in an X.Org Server world...

Wayland 1.22 is now available as the newest feature update to this core set of Wayland protocol and helper code...

Hell Let Loose planning Steam Deck support  GamingOnLinux

TUXEDO Stellaris 16 Linux Gaming Laptop Now Comes with an NVIDIA RTX 4090 GPU  9to5Linux

Asus announce the ROG Ally gaming handheld  GamingOnLinux

Asus announce the ROG Ally gaming handheld  GamingOnLinux

The post 8 Useful Commands to Monitor Swap Space Usage in Linux first appeared on Tecmint: Linux Howtos, Tutorials & Guides .

Linux memory management is an essential aspect of every System Administrator to improve the performance of a Linux system. It is always a good practice to monitor swap space usage in Linux to ensure

The post 8 Useful Commands to Monitor Swap Space Usage in Linux first appeared on Tecmint: Linux Howtos, Tutorials & Guides.

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 changes I made.

Here's how you can resolve the conflict:

1. Fetch and merge the latest changes from the remote repository:

   $ git pull

2. Identify the one or more conflicting files:

   $ git status

3. Open the conflicting file using a text editor:

   $ vim index.html

4. Resolve the conflict. The conflicting changes are marked by <<<<<<< HEAD and >>>>>>>. You need to choose which changes to keep and which to discard. Manually edit the file to combine the conflicting changes. 

   Here's an example:

   <<<<<<< HEAD Sample text 1 ======= Sample text 2 >>>>>>> feature-branch

   In this example, I changed the website heading to Sample text 1, while you have changed the heading to Sample text 2. Both changes have been added to the file. You can now decide which heading to keep or edit the file to combine the changes. In either case, remove the markers that indicate the beginning and end of the changes, leaving only the code you want:

   Sample text 2

5. Save all of your changes, and close your editor.

6. Add the file to the staging area:

   $ git add index.html

7. Commit the changes:

   $ git commit -m "Updated h1 in index.html"

   This command commits the changes with the message Resolved merge conflict.

8. Push the changes to the remote repository:

   $ git push

More on Git What is Git? Git cheat sheet Markdown cheat sheet New Git articles Resolution

 Merge conflicts are a good reason to focus your changes on code. The more you change in a file, the greater the potential for conflict. You should make more commits with fewer changes each. You should avoid making a monolithic change that combines multiple feature enhancements or bug fixes into one. Your project manager will thank you, too, because commits with clear intent are easier to track. A Git merge conflict may seem intimidating at first, but now that you know how to do it, you'll see that it's easily resolved.

Don't panic when you encounter a merge conflict. With a little expert negotiation, you can resolve any conflict.

Git What to read next This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License. 1 Comment Register or Login to post a comment. David C. | April 4, 2023 Register or Login to like

I always recommend that people add the following to their ~/.gitconfig file:

[merge]
conflictstyle = diff3

With this in place, when there are conflicts, you won't just see the two sources (your text and the conflicting text from the file being merged in), but you'll also see a block of text representing the common-ancestor text for the region in conflict.

This often provides very useful information to help resolve the conflict.

The post How to Build NGINX from Sources in RHEL, CentOS, Rocky and AlmaLinux first appeared on Tecmint: Linux Howtos, Tutorials & Guides .

Nginx is the fastest growing Webserver today on public internet-facing servers due to its free open-source modular model, high performance, stability, simple configurations files, asynchronous architecture (event-driven), and low resources needed to run. This

The post How to Build NGINX from Sources in RHEL, CentOS, Rocky and AlmaLinux first appeared on Tecmint: Linux Howtos, Tutorials & Guides.

The post How to View WebP Image and Convert WebP to PNG or JPEG in Linux first appeared on Tecmint: Linux Howtos, Tutorials & Guides .

Developed by Google with the main objective of making loading times faster across the internet, WebP (pronounced “weppy”) is a modern image format and a replacement for JPEG, PNG, and GIF file formats. Compared

The post How to View WebP Image and Convert WebP to PNG or JPEG in Linux first appeared on Tecmint: Linux Howtos, Tutorials & Guides.

Fedora Workstation developers and those involved at Red Hat have been working to improve the state of disk encryption on Fedora with a end-goal of possibly making the installer encrypt systems by default...

The Debian Installer for the upcoming Debian 12 "Bookworm" release has reached its release candidate phase...

Debian 12's Installer Reaches RC1 Status  Phoronix

New Privacy-Focused Browser Aims to Fight Data Tracking  CNET

PineTab2 and PineTab-V Linux tablets will launch April 11  Notebookcheck.net