git - CybAI news

21 Nov

Cherry-Picking in Git: A Solution for Pull Request Discrepancies

stp2y0 CommentsNewscoding, community, development, engineering, git, github, inclusive, learning, software, softwaredevelopment

In the world of professional software development, teams rely on Git to manage their version control systems. However, not all processes go smoothly. At times, discrepancies arise between pull requests and the remote branch, leading to situations where merging the branch into production is not feasible. This is where cherry-picking comes to the rescue. This article explores cherry-picking, its significance, real-life scenarios that warrant its use, and the commands and steps to implement it effectively. What is Cherry-Picking? Cherry-picking in Git refers to the process of selecting specific commits from one branch and applying them to another branch. Unlike merging…

07 Nov

Make master Branch Default Again

stp2y0 CommentsNewscoding, community, development, engineering, git, github, inclusive, master, software

I didn't follow the trend of changing my default branch from master to main. It doesn't make any sense to spend my resources reconfiguring my settings.Also, DHH agreed that it was a classic exploit of good faith. Historical Context: The Master Craftsman Tradition The term "master" has a rich history in European guild systems and skilled trades dating back centuries. A master craftsman (or "Meister" in German-speaking regions) was someone who had achieved the highest level of skill and expertise in their trade. This usage derives from the Latin "magister," meaning "teacher" or "chief." Apprentices would study under a master…

27 Sep

Provide Shared File Storage For The Company Offices

stp2y0 CommentsNewsaws, cloud, coding, community, development, engineering, git, googlecloud, inclusive, software

The company is geographically dispersed with offices in different locations. These offices need a way to share files and disseminate information. For example, the Finance department needs to confirm cost information for auditing and compliance. This file shares should be easy to access and load without delay. Some content should only be accessed from selected corporate virtual networks. Create and configure a storage account for Azure Files. Create a storage account for the finance department’s shared files Step 1 In the portal, search for and select Storage accounts. Select + Create. For Resource group select Create new. Give your resource…

21 Sep

Learning three-way recursive merge

stp2y0 CommentsNewscoding, community, development, engineering, git, github, inclusive, learning, programming, software

A method used in version control systems to automatically combine changes from different branches. It works by comparing three versions of the code, which is the base, head, and the branch to be merged. By analyzing the differences between these versions, the merge tool attempts to integrate changes seamlessly. Ever since I've learned how to use Git and GitHub to work collaboratively with group members, I have always followed a procedure where I resolve any conflicts in my branch first before merging to main or making a PR. This way, I prevent any issues making it to the main branch…

20 Sep

Superpowered Git Aliases using Scripting

stp2y0 CommentsNewscoding, community, development, engineering, git, inclusive, javascript, programming, software, terminal

What are Git Aliases Git aliases work similarly to regular aliases in the shell, but they are specific to Git commands. They allow you to create shortcuts for longer commands or to create new commands that are not available by default. Aliases run in the same shell environment as other git commands, and are mostly used to simplify common workflows. Simple Aliases Simple aliases call a single Git command with a set of arguments. For example, you can create an alias to show the status of the repository by running git status with the s alias: [alias] s = status…

19 Sep

Git Submodules

stp2y0 CommentsNewscoding, community, development, engineering, git, inclusive, software

While developing a project, you often want to have another project within it. Some common cases for such a need are the following: A shared repo containing formatting style guides or build tools A third-party library A repo that you want to Dockerize in your current project In these cases, you can use git submodules. Creating a Submodule To create a submodule within your git repo, you need to run the following command: git submodule add <url> <directory> Enter fullscreen mode Exit fullscreen mode Here <url> is a placeholder for the other repo's URL and <directory> for the directory name in which you want…

17 Aug

What is DevOps?

stp2y0 CommentsNewsaws, coding, community, development, devops, docker, engineering, git, inclusive, software

1. What is DevOps? DevOps is a cultural and technical movement that aims to bridge the gap between software development (Dev) and IT operations (Ops). By fostering a culture of collaboration and shared responsibility, DevOps seeks to improve the speed and quality of software delivery. Key Goals of DevOps: Enhanced Collaboration: Breaking down silos between development and operations teams. Faster Delivery: Accelerating the release of new features and fixes. Improved Quality: Enhancing the reliability and performance of software. Automation: Automating repetitive tasks to reduce manual effort and errors. 2. Core Principles of DevOps 2.1 Collaboration and Communication DevOps promotes a…

15 Aug

The current state of GitHub

stp2y0 CommentsNewscoding, community, development, engineering, git, github, ideas, inclusive, software, startup

It's not a secret that I dislike all the things that Microsoft owns, and yet, I'm haunted by them every single day. No day passed by without I'm forced to use Microsoft Teams, Azure with their terrible excuse of scrum boards, or GitHub, with their lack of features only being compensated for the free things they offer. The only exception is VSCode, but they are really trying their best to make it as bloated as possible, so I have high hopes for Zed. The last straw Today, I noticed something very special: GitHub is working on lists to organize your…

03 Aug

Setting Up Git and GitHub,Creating Repository,Making Comments,Pushing and Pulling

stp2y0 CommentsNewscoding, community, development, engineering, git, github, inclusive, repository, software, vscode

Git is a distributed version control system used to track changes in source code during software development. It allows multiple developers to collaborate on a project, manage different versions of the code, and maintain a history of changes. It helps in tracking code and who made the changes What Does Git Do ? Manage projects with Repositories Clone a project to work on a local copy Control and track changes with Staging and Committing Branch and Merge to allow for work on different parts and versions of a project Pull the latest version of the project to a local copy…

03 Aug

A Quick Start to Git and GitHub

stp2y0 CommentsNewscoding, community, developer, development, devops, engineering, git, github, inclusive, software

Check out My Repository Table of Contents IntroductionSetting Up Git Installation Configuration Creating a Repository Initializing a Repository Cloning a Repository Basic Git Commands Checking Status Adding Files Making Commits Pushing Changes Pulling Changes Introduction Git and GitHub have become essential tools for developers worldwide. Git is a version control system that tracks changes in source code, while GitHub is a web-based platform for hosting Git repositories. Mastering Git and GitHub is crucial for modern software development and devops. This guide will walk you through setting up Git, creating a repository and using the basic commands like commits, pushing and…