News for hackers. Stuff that matters.

A comment on Why SQLite Does Not Use Git. Parent comment

Re:Why SQLite Does Not Use Git by e12e on Wednesday April 11, 2018 @02:06AM (#16808462)
"pull" might be the first thing I'd throw out, if thought there was any hope of fixing git ux. Then add a working merge --dry-run #do i have conflicts?.
[ Parent | on HN ]
Re:Why SQLite Does Not Use Git by aidenn0 on Wednesday April 11, 2018 @12:01PM (#16812467)
I think a default of --ff-only would be fine for pull. This is great for when I'm merely a consumer of a project, and will never silently perform a merge or rebase.
[ Parent | on HN ]