Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
eitland
on Jan 2, 2018
|
parent
|
context
|
favorite
| on:
Fix All Conflicts: Easy-To-use CUI for Fixing Git ...
Haven't tested this yet but for now my preferred solution is to edit the conflict markers directly in vs code then stage.
Consider applying for YC's Spring batch! Applications are open till Feb 11.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
