Best of Git — May 2022
- 1
- 2
- 3
freeCodeCamp·4y
How to Resolve Merge Conflicts in Git – A Practical Guide with Examples
Git is an open-source distributed version control system. It helps you manage your project files easily using local branching, staging, and workflows. Many developers are confused about concepts like merging and resolving merge conflicts. In this article, we will learn how to resolve merge conflicts in a practical way.
- 4
DevDojo·4y
The best VS Code extensions to supercharge Git (yes, there’s more than GitLens!)
Git Graph is the most visually appealing way to interact with Git in VS Code. Git Automator allows you to add and commit files with a shortcut. Git Urgent lets you git add all, commit and push with one command. Git Tree Compare compares your working tree against a branch, a tag or commit.
- 5
Hashnode·4y
Can You Resolve Merge Conflicts Before They Happen?
Merging conflicts are an event that occurs when Git is unable to automatically resolve differences in code between two commits. They can happen as a result of merging branches, during a rebase or when you’re cherry-picking in Git. We can either solve them manually or use a Git GUI such as the ones built into VS Code or Jetbrains IDEs.
- 6
Git And GitHub For Beginners
Git and GitHub are very important tools for a developer and it doesn't matter at what stage of your career you are, you can learn them. In the first part we are going to learn what is Git and GitHub and how can we use them? And then in the second article i.e., Getting Started With Open Source (coming soon!), we will discuss what is open source and how you can contribute.
- 7
Getting Started With Open Source
Part two of the Git GitHub And Opensource series. We are going to learn how we can use these tools to make contributions to open source projects. In this tutorial we will be using a beginner-friendly open source project so you can make your first contribution easily: link.
- 8
Towards Data Science·4y
How Git truly works
Git is undoubtedly one of the principal cornerstones of modern software development. As of November 2021 GitHub, the main repository manager of Git, reported having over 73 million developers and more than 200 million repositories. Blobs, trees, and commits are the main components of Git’s data structure.
- 9
gitconnected·4y
7 Lesser-Known Git Commands and Tricks
Git is the software industry’s default source code management solution. Every software development team tends to use Git and remote Git hosting services for maintaining their codebases. The official Git CLI offers a complete solution for managing Git repositories via terminal interfaces. We typically use the same commands set every day, so there are some useful hidden commands in Git.
- 10
Python in Plain English·4y
Git Advanced Configuration
The $ git config command is the most preferred way to set Git configuration values of a global or local file. We will use a very useful workflow tool of Git named Alias. Alias creates shortcuts to frequently used commands to increase ease and speed while working with the Git command line.
- 11
How Git stores data
Git is a distributed version control software, which means you don’t need an external server to use it. All the data that Git needs is stored in the .git folder. Git stores every single version of each file it tracks as a blob. Any change to the file content will generate a completely new blob object.
- 12
GitLive Now Works With Any Git Repository in WebStorm!
GitLive now works with any Git repository in WebStorm. The offline mode uses the data from your local Git repository only and nothing is sent outside your network. Click on the author's avatar to inspect a change and see the diff, what branch they're from and even cherry-pick changes straight into your local file.
- 13
Changelog·4y
wfxr/forgit: A utility tool powered by fzf for using git interactively.
Forgit is a tool for using git interactively. Powered by junegunn/fzf. Designed to help you use git more efficiently. It's lightweight and easy to use. Make sure you have fzf installed. Use git aliases by making git-forgit available in $PATH : FORGIT_COPY_CMD='xclip -selection clipboard'
- 14
Git Timeline Generator
You can use this tool with any repository that you have access to. The timeline is generated from a CSV that you create using git log. You can rename/combine/exclude committers, specify the number of commits for a person to be included, give the timeline a name, and more.
- 15
Pointer·4y
gogs/gogs: Gogs is a painless self-hosted Git service
The Gogs project aims to build a simple, stable and extensible self-hosted Git service that can be set up in the most painless way. With Go, this can be done with an independent binary distribution across all platforms that Go supports, including Linux, macOS, Windows and ARM-based systems.
- 16
How to Solve Git Merge Conflicts
Git is a Version Control System that manages contributions between distributed developers. Sometimes more than one developer tries to edit the same content, which may occur conflicts. To reduce the occurrence of such an event, developers generally work in isolated branches. To merge these isolated branches and resolve any conflicts, we use git merge command.
