hint: after resolving the conflicts, mark the corrected paths

This means that you need to explicitly tell Git that you've resolved a conflict at each file or folder (that is path).

Showing the list of yet unresolved conflicts:

git status

Marking a conflict as resolved.

File or all files in a folder should be left and all conflicts are resolved:

git add

File or folder should be removed:

git rm

Next step:

git commit

because some files are in conflict ,you can type git status to find out what is the file with conflict, and after the conflict was sovled ,just git commit -m sth log ,at last git cherry-pick your-commmit-id . see details http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick#Resolve_conflicts

For which values of $x \in R$ does the series $\{x^\mathrm{k_n}\}^\infty_\mathrm{n=1}$ converge.

Melnikov's method, homoclinic orbits, and bifurcation values

Is this expression identical to just a Dirac delta?

if $z=2021+2021i$ prove $w_0+\cdots+ w_{2020}=0$

Is it possible that pair of isomorphic subgroups of finite group is conjugate in some larger group

Prove there isn't a group $G$ that satisfy ${\rm Aut}(G) \cong \mathbb{Z}$ [duplicate]

Can a contradiction result in a logical consequence

Can anyone help me solve this problem on Sequences/Series?

For real numbers $z$ and $w$, $|(1+z)(1+w)-1| \leq (1+|z|)(1+|w|)-1$.

Can we subtract an inequality from the same inequality, and if so, does that mean $0<0$ is a true statement?

How to evaluate the integral $\int_{0}^{\infty}\frac{\cos {(ax)}-\cos{(b x)}}{x^2 }dx$?

Let A = $\left\{1,\:2,\:\left\{1,\:2\right\}\right\}$, how many elements are in the set $P(A)\setminus A$?