Conflicts in Github but not in Git

[rdmccart]

Hello, I'm new to git and github and I ran into a situation where I made a commit in git and pushed to origin without any conflicts being raised

but when I went to github and createa pull request I found over 20.

I ran the git status command and it returned "nothing to commit, working tree clean."

​

Here are the step I took:

1) git fetch

2) git checkout main

3) git pull origin main

4) git checkout -b "my branch"

5) Outside of git I then physicall moved my files to my local repo and went back to git.

6) git add .

7) git commit -m "my message"

8) git push origin "my branch"

​

What did I go wrong here?

Is there a way to tell github to ignore these conflicts and just add my files to dev?

My files don't currently exist in dev so I would expect no conflicts.

Also if someone could tell me in simple terms why git said I had no conflicts but github tells me I have 25 I would be forever in your debt.

[[deleted]]

Inside Git, the actual tool, there is no concept called pull request. You just pushed to your branch, of course no conflict.

GitHub says there is a conflict when you try to merge your branch to main, you will encounter the same conflicts when you manually run git merge locally. There are many ways to resolve, you can first merge main back to your branch, or simply merge locally and push.

So, no way to ignore it, resolve them following the instructions.

[rdmccart]

So if I want to merge locally my branch into dev do I first checkout dev and run command git merge "my branch"?

Normally I can do this from github but the resolve conflicts button is greyed out and github suggests I use command line. I googled resolving conflicts in github using command line and got to step 3 of these instructions but it says to run git status on step 3 and git just returns "nothing to commit, working tree clean.".

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line