Y
HN Search
Hacker News Search
new
|
comments
|
top
|
jobs
fpig
searching PlanetScale…
1.
▲
2.
▲
3.
▲
4.
▲
5.
▲
6.
▲
43 ms
·
181.
▲
by
fpig
10y ago
I don't understand the problem here, why didn't he just do a merge and resolve the 18 conflicts by using the version of the file from master? And the problem wasn't in checkout-add-commit, that is a trivial issue, the WTF her