GitHub Actions workflows for GitHub Pages just became generally available. GitHub Pages is a service that lets you host static websites on GitHub directly from your repositories. GitHub Actions is a continuous integration and continuous delivery (CI/CD) platform provided by GitHub that allows users to automate their build, test, and deployment pipelines. This article takes you through using custom workflows to deploy static websites to GitHub Pages with GitHub Actions workflows.

In my previous article, I discussed merge conflicts, specifically line merge conflicts, and how to resolve them on GitHub. In this article, I will focus on another type of merge conflict, the modify/delete conflict, and how to resolve it using Git.

Most of the time, merging branches in Git is an automatic process of integrating the changes on one branch into another. Sometimes, a conflict prevents Git from completing the process without human intervention. This article briefly examines content (line) merge conflicts and how to resolve them. If you are new to Git, please read the previous guides in this Git beginner series.

The post Resolve content (line) merge conflicts in GitHub first appeared on 4sysops.