git

Articles: 30

Recently published

Article

Git: Guide to Solving Merge Conflicts

Merge Conflicts arise when multiple agents modify the same part of a file and push their changes to a remote branch. When you attempt to merge, pull from or push to these branches - there's a conflict, and Git isn't sure which set of changes to accept and which to...

David Landup

Nov 20, 2021

Article

Getting Started with GitHub Actions - Software Automation

In this guide, we'll take a look at what GitHub actions are, how they work, and build a workflow using Python to showcase how you can use GitHub actions to automate tasks. Since its inception in 2008, GitHub has grown to become the de facto leader in development project hosting....

Dragan Bjekic

Oct 06, 2021

Article

Git: Show Date of a Commit

As we've covered in many of our previous articles, Git is a very useful tool for developers, albeit, it tends to be a bit confusing to newcomers. And all the while many know the basics of Git and know how to perform common operations, such as merging commits, branching, or...

Scott Robinson

Oct 04, 2021

Article

Git: Stop Tracking File After Adding to .gitignore

Accidentally forgot to add a file to the .gitignore file and started tracking it with other files? Or perhaps a remote repository already has a file tracked that you've cloned, but would like to stop tracking? Just as important as tracking changes is not tracking them in certain cases, lest...

David Landup

Jun 25, 2021

Article

Git: Undo Latest Local Commit

Accidentally committed something to the wrong branch? Perhaps, you just committed the new shining feature, and to your dismay, there's a typo in the user interface you haven't seen before, and you'd like to take the commit back to fix that as well? In some cases, you can fix it,...

David Landup

Jun 21, 2021

Article

Git: Stashing Uncommitted Changes

If you've been working with Git long enough, you've probably had times where you made changes to your codebase, but needed to switch branches or work with the latest working version of your code. However, you don't want to lose the changes you've made already, but they're not yet ready...

Scott Robinson

Jun 10, 2021

Article

Beginner's Introduction to Jenkins - CI/CD

The advent of fast-paced development with many methodologies like Scrum, Agile and Kanban brought along some key issues: developers working in small increments spent a lot of time waiting for the new version to build, reach the testers and eventually get deployed. The development process would be much faster if...

Dragan Bjekic

Jun 04, 2021

Article

Git: An Introduction for Beginners

Software development is inherently full of challenges. This ranges from architecting your software, maintaining it, fixing bugs, deploying, and the list goes on. When starting out, you'd think that the easy part would be to share you code with others. After all, they're just text files, right? This may not...

Scott Robinson

Feb 28, 2020·6 min read

Article

Git: Adding a Commit Message

As many programmers have found out the hard way, adding documentation is extremely important in being able to easily make modifications to your code, fix issues, pass off to others, etc. Just because your code makes sense now doesn't mean it'll make sense to you in 6 months (or even...

Scott Robinson

Feb 26, 2020·2 min read