Tyler Made

  • Cloud
  • Virtualization
  • Linux Server
  • Windows Server

github

Linux Server

How to git pull and overwrite file conflicts

I use git for version control. One of the biggest conveniences for me is running “git pull” to download the latest commits. But sometimes, the git pull fails because of a file that changed on the server. That’s usually my fault. $ git pull […] * [new branch] master -> Read more…

By Tyler Woods, 8 yearsJanuary 27, 2017 ago
Search
Recent Comments
  • Chris Findley on Powershell script to monitor DFS replication backlog
  • karenl on How to install Docker on an unsupported Synology NAS (updated 2020)
  • Al on Synology DS416play has an (unused) eSATA port hiding inside!
Archives
  • May 2018
  • April 2018
  • January 2018
  • October 2017
  • September 2017
  • August 2017
  • June 2017
  • May 2017
  • April 2017
  • March 2017
  • February 2017
  • January 2017
  • December 2016
Categories
  • Active Directory
  • Amazon AWS
  • Bare Metal
  • Cisco Meraki
  • Cloud
  • DigitalOcean
  • Docker
  • File Services
  • FreeNAS
  • Google Cloud
  • Group Policy
  • Hardware Appliances
  • Hyper-V
  • Linux Server
  • Microsoft Azure
  • Networking
  • Opinion
  • Other
  • PowerShell
  • Scripting
  • Security
  • Security Appliances
  • Shell
  • Software Appliances
  • Sophos UTM
  • Storage
  • Synology
  • Uncategorized
  • Virtualization
  • VMWare ESXi
  • Vultr
  • Web
  • Windows Server
Recent Articles
  • Customize your Linux or bash shell style with PS1 definitions in .bashrc May 10, 2018
  • How to downgrade virtual machine hardware version – VMWare April 25, 2018
  • How to install Heimdall Application Dashboard on Ubuntu 16.04 April 25, 2018
  • Install Dell OpenManage Server Administrator 9.1 for VMWare vSphere ESXi 6 and 6.5 January 15, 2018
  • How to fix Shockwave Flash crashing with vSphere Web Client 6.X October 19, 2017
Recent Comments
  • Chris Findley on Powershell script to monitor DFS replication backlog
  • karenl on How to install Docker on an unsupported Synology NAS (updated 2020)
  • Al on Synology DS416play has an (unused) eSATA port hiding inside!

  • Cloud
  • Virtualization
  • Linux Server
  • Windows Server
Hestia | Developed by ThemeIsle