Ravenhub Blog

Another blog of a random IT guy on the internet

  • Home
Home » Archive for October 2025

How to Resolve Git Merge Conflicts

05 October 2025 - Posted in How To by Rabenherz
If you’ve ever worked with Git for a while, chances are you've run into a merge conflict. It usually happens when your code and the upstream repository (the original project you forked from) don't [...] Read more

About

Just the thoughts of another random german IT guy on the internet. Why am I doing this? Well, why not?

Follow

GithubRSS

Recent posts

  • How to Resolve Git Merge Conflicts
  • Use Tailwind CSS in a Static Website (Without the Play CDN)
  • Fixing Outlook's wrong MAPI address (SCP vs Autodiscover)
  • How to Upgrade Your Domain Functional Level (DFL) in Active Directory
  • Expanding your linux VM Disk: Resize LVM partition without creating a new one

Archives

  • ▼ 2025 (7)
    • October (1)
    • September (1)
    • May (1)
    • April (1)
    • March (1)
    • February (1)
    • January (1)
  • ► 2024 (9)
    • December (1)
    • November (1)
    • July (1)
    • June (3)
    • May (2)
    • April (1)

Category

  • How To (9)
  • IT Security (3)
  • Technology Compendium (4)

Tags

2fa active-directory Active Directory AD management ad-trusts authentication certificates css dfsr digital-privacy docker domain-functional-level e2ee email exchange-server git government GPO group policy Hypervisor image instant-messaging it-basic linux server mfa networking obfuscation pixelation privacy-rights resource management sid-filtering ssh storage systemd tokens Virtual Machine Virtualization website Windows Server
(c) Rabenherz Powered by HTMLy