Forem Feed

Follow new Subforems to improve your feed

DEV Community

A space to discuss and keep up software development and manage your software career

Gamers Forem

An inclusive community for gaming enthusiasts

Future

News and discussion of science and technology such as AI, VR, cryptocurrency, quantum computing, and more.

Music Forem

From composing and gigging to gear, hot music takes, and everything in between.

DUMB DEV Community

Memes and software development shitposting

Vibe Coding Forem

Discussing AI software development, and showing off what we're building.

Popcorn Movies and TV

Movie and TV enthusiasm, criticism and everything in-between.

Design Community

Web design, graphic design and everything in-between

Maker Forem

A community for makers, hobbyists, and professionals to discuss Arduino, Raspberry Pi, 3D printing, and much more.

Scale Forem

For engineers building software at scale. We discuss architecture, cloud-native, and SRE—the hard-won lessons you can't just Google

Forem Core

Discussing the core forem open source software project — features, bugs, performance, self-hosting.

Crypto Forem

A collaborative community for all things Crypto—from Bitcoin to protocol development and DeFi to NFTs and market analysis.

Skip to content

Powered by Algolia

Log in Create account

DEV Community

Copied to Clipboard

Share to X Share to LinkedIn Share to Facebook Share to Mastodon

Report Abuse

Ibrahim

Posted on Jul 3

Here's what to do when git stash pop causes conflicts.

Sign in to view linked content

Top comments (0)

Subscribe

Create template

Templates let you quickly answer FAQs or store snippets for re-use.

Dismiss

Code of Conduct • Report abuse

Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.

Hide child comments as well

For further actions, you may consider blocking this person and/or reporting abuse

I am a general web developer, and I enjoy writing about how I solve programming problems.

Location

Indonesia
Joined

Sep 8, 2019

More from Ibrahim

Setting Up ESLint, Prettier, Husky, and Lint-Staged in a TypeScript Project

#typescript #git #cleancode #node

How to Set Up ESLint, Prettier, Husky, and Lint-Staged in a TypeScript Project

#typescript #git #cleancode #node

I Finally Understand .gitkeep

#git #cli #bash

💎 DEV Diamond Sponsors

Thank you to our Diamond Sponsors for supporting the DEV Community

Google AI - Official AI Model and Platform Partner

Google AI is the official AI Model and Platform Partner of DEV

Neon - Official Database Partner

Neon is the official database partner of DEV

Algolia - Official Search Partner

Algolia is the official search partner of DEV

DEV Community — A space to discuss and keep up software development and manage your software career

Home
DEV++
Podcasts
Videos
Tags
DEV Education Tracks
DEV Challenges
DEV Help
Advertise on DEV
DEV Showcase
About
Contact
Free Postgres Database
Software comparisons
Forem Shop

Code of Conduct
Privacy Policy
Terms of Use

Built on Forem — the open source software that powers DEV and other inclusive communities.

Made with love and Ruby on Rails. DEV Community © 2016 - 2025.

DEV Community

We're a place where coders share, stay up-to-date and grow their careers.

Log in Create account