Contact person: Business Client

Phone:Show

Email:Show

Location: Hyderabad, India

Budget: Recommended by industry experts

Time to start: As soon as possible

Project description:
"I’m stuck in a loop of code-level merge conflicts on a private GitLab repository. The conflicts keep reappearing and I can’t trace which commit—or contributor—actually introduced the changes.

Here’s what I’ve already attempted: running the usual git commands (rebase, cherry-pick, log, bisect) and using the GitLab web interface to trigger automatic merges, but neither path pinpoints the root cause.

Your task is to step in, inspect the commit history, isolate the offending changes, and deliver a clean merge that keeps every branch intact. If a better workflow—rebasing strategy, protected branch rule, or even a third-party diff tool—will prevent this in the future, I’m open to it. And need to identify the source of changes.

Deliverables
• A conflict-free merge pushed to the repository
• A concise summary of what caused the conflicts and how you resolved them
• A short set of commands or GitLab settings I can follow to avoid similar issues next time

That’s it—once I can merge confidently again, the job is complete." (client-provided description)