Size: a a a
Vs
Vs
16:51 Cherry-pick Failed
ed626fb0 Added damage to the player if he catches 2 or more fish in the reservoir.
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
Vs
git commit --allow-emptyviDv
16:51 Cherry-pick Failed
ed626fb0 Added damage to the player if he catches 2 or more fish in the reservoir.
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
Vs
P
JC
vi :DDv
vi :DJC
git commit --allow-emptyvinanoDv
Vs
Dv
git rebase --abort, чот такоеDv
--abort.LB
m
Dv
m
Dv
m
P
git submodule update --init --recursive руками