DEV Community: Ikrame Ibn Hayoun

[Boost]

Ikrame Ibn Hayoun — Fri, 14 Aug 2026 16:56:03 +0000

Ikrame Ibn Hayoun

Aug 5

I kept seeing the same Git complaint on Reddit, so I wrote a small CLI for it

#python #git #opensource #development

2 min read

[Boost]

Ikrame Ibn Hayoun — Fri, 14 Aug 2026 16:44:36 +0000

Ikrame Ibn Hayoun

Aug 8

The blurry line between junior and mid-level, from an AI-era developer

#discuss #ai #programming #webdev

2 min read

The blurry line between junior and mid-level, from an AI-era developer

Ikrame Ibn Hayoun — Sat, 08 Aug 2026 17:37:05 +0000

I've been thinking about what being a junior developer actually means today.

When ChatGPT came out, I tried it because it was new, but I wasn't really interested in programming yet. Then, one summer, I decided to give a random Python course a try. I enjoyed it, and the following year I started a two-year vocational training program in software development. So AI has been around for pretty much my entire journey into programming.

I've used it to explain things I didn't understand, give me examples, help me debug, and sometimes write code for me. I remember the first time I asked it to write something and got a working result. It was strange. I had barely started learning, and suddenly I had a tool that could fill in a lot of the gaps for me. This was when ChatGPT was much worse than it is today, with plenty of hallucinations and confidently wrong answers, but it was still enough to make me wonder: how much of this do I actually know?

In a way, we now have a teacher available whenever we need one. You can ask the same question five different ways, get examples, have your code reviewed, or ask why something isn't working. That's an incredible learning tool. And while looking into this, I found that similar reactions happened when frameworks and other abstractions became popular. Some developers saw them as shortcuts or even “cheating”, which reminded me of the current discussion around vibe coding. Maybe this feeling isn't entirely new. Programming has always been about using better abstractions and tools.

That's where I find the distinction between junior and mid-level particularly interesting. AI can make someone with relatively little professional experience much more independent, so where exactly does the line sit?

Is it how well you perform on a DSA problem? How you answer technical questions in an interview? How much you can build without help? All of these things can be practiced, prepared, and increasingly assisted by tools.

I kept seeing the same Git complaint on Reddit, so I wrote a small CLI for it

Ikrame Ibn Hayoun — Wed, 05 Aug 2026 17:56:39 +0000

I was reading Reddit threads about Git annoyances — not big architecture debates, just the little things that waste time. One kept coming up: merge conflicts that are only import lines at the top of a Python file.

Someone on one branch adds import os. Someone else adds import math. Same file, same place. Git treats it like a real conflict, and you end up deleting conflict markers by hand even though you just want both imports.

The cover image is a quick sketch I made in Excalidraw while figuring out the flow: conflict in → one command → clean imports out.

What I looked at

Before writing anything, I checked how this is usually handled:

GitHub's official guide walks you through opening the file and fixing markers by hand. That is the right approach for real logic conflicts. It is just slow when the conflict is only imports.
Common Stack Overflow answers push git checkout --ours or --theirs. That keeps one side and throws away the other — so you can delete an import your teammate still needs.
Formatters like isort, ruff, and Black help keep imports tidy, but they fail while conflict markers are still in the file.
There are heavier tools too (structural merge drivers, LLM helpers) if you want that trade-off.

I could not find a small local command that only handles this case, so I wrote one.

The tool

pip install import-resolve-cli
import-resolve-cli

Before (Git still conflicted):

import json
<<<<<<< HEAD
import os
=======
import math
>>>>>>> feature

print(json.dumps({"ok": True}))

After (both imports kept, markers gone):

import json
import math
import os

print(json.dumps({"ok": True}))

If you run it with no file paths, it asks Git for conflicted .py files. There is also --dry-run, --check, and an optional --install-hook that registers a merge driver for this repo only (not your global Git config).

Limits

It only rewrites a conflict block when every non-blank line on both sides is a single-line import / from or a comment. Anything else is skipped with a reason — including multiline imports, indented imports, and logic mixed into the same block. Conflicts further down the file stay for you.

That is intentional. I wanted help with the mechanical part, not a tool that tries to merge real code for me.

Out of scope	Why
Business-logic conflicts	Needs human intervention
Multiline import blocks	Too easy to corrupt; skipped with a warning
Full isort/ruff style	Run your formatter after; sorting here is simple
JS/TS imports	Possible later
Config files	No config by design

ikrame-ih / import-resolve-cli

import-resolve-cli

Resolve Git merge conflicts that only touch Python import lines.

$ git merge feature-branch
CONFLICT (content): Merge conflict in app.py
$ import-resolve-cli
[ok] app.py: resolved 1 import conflict

Install

pip install import-resolve-cli

Python 3.9+, no runtime dependencies.

Example

Two branches each added an import. Git left this:

import json
<<<<<<< HEAD
import os
=======
import math
>>>>>>> feature-a

print(json.dumps({'ok': True}))

After import-resolve-cli:

import json
import math
import os

print(json.dumps({'ok': True}))

Same example as files in docs/examples/.

Usage

import-resolve-cli                 # every conflicted .py file reported by git
import-resolve-cli app.py utils.py # specific files
import-resolve-cli --dry-run       # print the diff, write nothing
import-resolve-cli --check         # exit 1 if conflict markers remain

Exit codes: 0 done, 1 conflicts left for you, 2 usage…

View on GitHub

Python 3.9+, no runtime dependencies. If you try it on a real conflict and something looks off, I would be glad to hear about it in an issue.

If this saves you a few minutes, a star on the repo helps others find it!

DEV Community: Ikrame Ibn Hayoun

[Boost]

I kept seeing the same Git complaint on Reddit, so I wrote a small CLI for it

[Boost]

The blurry line between junior and mid-level, from an AI-era developer

The blurry line between junior and mid-level, from an AI-era developer

I kept seeing the same Git complaint on Reddit, so I wrote a small CLI for it

What I looked at

The tool

Limits

Links

ikrame-ih / import-resolve-cli

import-resolve-cli

Install

Example

Usage