8/10 Cant merge, Cant commit


#1

I am super confused.
What did i get wrong?

When i try to commit it says i can't commit during a merge.
When i try to merge it tells me i need commit.

DA FUK?
What did i do wrong?

Edit: The markings did show up and i deleted them


#2

I solved it, but i don't know how so some input is still very welcome xD


#3

git commit commits all files in the staging area (files in the staging area's are files you specified with the git add command)

So, since git commit commits all files in the staging area you can simple do:

git commit -m "some useful comment"

you can see which files are in the staging area with git status


#4

It took me a while to actually understand but yeah
since i gave it a file parameter it thought i was just doing a partial commit.
Not of the whole branch

git commit -m "comment"

Worked