Merging a second branch with the main branch

[strikeouts27]

Merge help needed, considering force push.

I am new to Github. I a recently made a branch and have done a ton of work on the second branch but it will not merge with my main branch. I get the error message, unable to merge unrelated histories in this repository. The thing is, i know for a fact that the branch, called second branch, came from main branch. They should have the same histories but Git is saying they do not.

Git Desktop gives me the option to force push the origin, which I percieve might be able to push all of my working code and everyone else can reset their own local branch to match the history of the remote. I was thinking we could all do a git pull first and be on the same page, and than i force push it.

Is there another way to do the merge? I will abstain from doing anything until I have some coaching.

Guidelines

• I have read and understood this category's guidelines before making this post.

[strikeouts27]

E:
I have a fix for that but that often means you are doing something wrong elsewhere, eg you are mixing another git repo
How did you get here? Because you may continue to have this issue again next time

strikeouts27:
From my the last time we worked togather, we all got our setup created on our local machines. We created one branch and worked on it and than merged it into main. Than we created a second branch, did a ton of work on it, and tried to merge it and it would not work. We created these branches from the github website.
that being said
at the start of the project

E:
Hmm you are not using rhe command line right?
From what you described you shouldn't have an issue

strikeouts27:
we were in one respoistory but the person controlling it was not active and wasn't showing up so we created another repository and set up postgress and everything else so that i would have control

that must be where the issue has started.

E: Yeah that's a problem, you should remove git folders when you do that

This is what I used for that scenario

git push -u origin master --allow-unrelated-histories

[TheGiraffe3]

Try using the browser, making a PR, and merging it there.

[support-designfitout]

Remove: git branch -D main && git branch -m main && git push -f origin main
Use instead: git fetch origin main && git merge origin/main --allow-unrelated-histories && git push origin main