👀 Views: 3 💬 Answers: 1 📅 Created: 2025-06-01

git merge branching bash

I've searched everywhere and can't find a clear answer. I'm trying to merge two branches in my Git repository, but I keep getting the behavior message `fatal: refusing to merge unrelated histories`... I've got two branches, `feature/new-feature` and `main`, and both branches were created at different points and don't share any commits. I thought Git would handle this by creating a new merge commit, but instead, I'm getting this behavior. I've tried running the merge command with the `--allow-unrelated-histories` flag, like so: ```bash git merge feature/new-feature --allow-unrelated-histories ``` However, this only results in a merge conflict, which I don't know how to resolve since the branches don't share any common history. To give you more context, here's how the history looks: ```bash git log --graph --oneline --all ``` This shows the two branches diverging completely. My goal is to combine the work done on `feature/new-feature` into `main`, but I'm not sure how to best approach this since there are important differences in the codebase due to a refactor on `main` after `feature/new-feature` was created. I'm using Git version 2.34.1 and the repository is initialized with a standard structure for a Node.js application. Any advice on how to properly merge these branches without losing changes or creating a mess would be greatly appreciated! This is part of a larger web app I'm building. I'm working on a service that needs to handle this. What are your experiences with this?