Skip to content
The Miners

The Miners

Codeminer42’s Engineering Blog

Tag: Github

Git: Ours or Theirs? (Part 1) Tips for resolving conflicts automatically

Git: Ours or Theirs? (Part 1)

Tips for resolving conflicts automatically

Will Soaresby Will SoaresFebruary 7, 2017January 12, 2023

In this article, I will assume that you already have a basic understanding of Git and consequently is familiar with the process of sharing code …

Crazy Developer in Git commit – -amend

Crazy Developer in Git commit – -amend

Jônatas Rancan de Souzaby Jônatas Rancan de SouzaFebruary 6, 2017January 12, 2023

Are you new on git? And you know these commands: git add , git commit , git pull , git push , git status. But …

Content type

Beginner Intermediate Advanced

Recent Posts

  • Alternative for non-powerful machines to develop mobile applications
  • Symmetric Encryption in JavaScript for PII
  • Mastering Git workflow – Part 2/2
  • Using Mapbox to plan a city: a use case
  • Test mocking in practice with Sinon

Tags

Activerecord API C Clean Architecture Crystal Lang CSS Database Design Patterns DevOps DI Docker Docker Compose Elixir ES6 Flutter Front End Development Functional Programming Git git-stash git-worktree Github JavaScript Node.js Nodejs Package Management Performance Programming Rails React Redux Refactoring Ruby Ruby on Rails Software Architecture Software Development State Management Test Testing Tutorial Typescript Vue Vuejs Vuex Web Development Yarn

Meta

  • Log in
  • Entries feed
  • Comments feed
  • WordPress.org
Copyright © 2023 Codeminer42. Powered by WordPress and Bam.