No Conflicts with Git but Github Shows Conflicts

[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.

[rdmccart]

Hi @KohoolateSen ,
Thanks for the response. I try to follow the instructions here for resolving conflicts using command line but step 3 says run git status and when I do that it says "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

[jfullstackdev]

maybe you forgot to pull from GitHub first, so all changes in there is not in your local

here is the answer of Copilot,

---

The issue you're facing is likely due to differences between your local branch and the branch you're trying to merge into on GitHub. When you create a pull request on GitHub, it's trying to merge your changes into the target branch (in this case, dev). If dev has changed significantly since you last synced with it, there could be conflicts even if there were none when you pushed your branch.

Here's a simplified explanation: Git tracks changes to files, not the files themselves. When you create a pull request, Git tries to apply your changes onto the target branch. If the parts of the files you've changed also have changes in the target branch, Git won't know which changes to keep and which to overwrite, causing a conflict.

To resolve this, you need to sync your branch with the latest changes from dev and resolve any conflicts. Here's how you can do it:

1. Fetch the latest changes from the remote repository:

git fetch origin

2. Checkout to your branch:

git checkout "my branch"

3. Merge the latest changes from dev into your branch:

git merge origin/dev

At this point, Git will either successfully merge the changes, or tell you that there are conflicts. If there are conflicts, you'll need to resolve them:

1. Open the files with conflicts in your text editor. Git will have marked the conflicting areas with <<<<<<<, =======, and >>>>>>>. Edit the file to resolve the conflicts, keeping the changes you want and removing the conflict markers.

2. After you've resolved all conflicts, stage the resolved files:

git add <resolved-file>

3. Once all conflicts are resolved and the resolved files are staged, commit the merge:

git commit -m "Resolved merge conflicts"

4. Finally, push your branch to the remote repository:

git push origin "my branch"

Now, you should be able to create a pull request on GitHub without conflicts. Remember, it's important to regularly sync your branch with the target branch to minimize conflicts when you create a pull request.

[ramazan-biyik]

Github cant evaluate the conflicted file. It is not a consistent issue. Please see the RESOLVE CONFLICTS button. It is a disabled button. In normal cases it is enabled.