0

Within project, someone pushed new files, I didn't pull them, then I've added new files, commited and then tried to push it to main.

git push -u origin main

Returns

! [rejected]        main -> main (non-fast-forward)

Then git checkout main

Gives me

README.md: needs merge
error: you need to resolve your current index first

How to solve conflict and proceed with my push?

mkrieger1
  • 19,194
  • 5
  • 54
  • 65
feration48
  • 145
  • 7

1 Answers1

2

You would need to open README.md and remove the merge markers, choosing in the process which contribution side you want to keep.

Then add, and commit.

Make sure you have set (with Git 2.6+, Sept. 2015):

git config --global rebase.autosquash true
git config --global pull.rebase true

From there, a simple git pull will replay your own commits on top of origin/main. Resolve conflicts, if there are any.
And push.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250