Hacker News Reader

Comment by throwawayboise | Hacker News Reader

Seen it happen so often when people try to get fancy with branches and merges.

Yes I'm sure there's always a way to recover using the tools, but if you are not a git guru and don't have one handy, deleting and cloning is usually the more pragmatic way.

View on HN

IMO conflict resolution is almost always harder than redoing the change by hand, especially while looking at the old diff and redoing it towards the new branch. Kind of ironic given how hard diff editors try to help.

When I get into a three way merge it's usually just too late in the day, so I will just save off my stuff and merge in manually :) like you said. Two things to compare against is plenty.

I don't see the issue. This is how people fix everything else, it is what comes naturally, and it works every time. I would much prefer it this way, than what Fossil appears to do in section 3.3 of this article, having a single copy of the database per system.

    mkdir ~/fossils
    fossil clone https://sqlite.org/src ~/fossils/sqlite.fossil
    mkdir ~/sqlite; cd ~/sqlite
    fossil open ~/fossils/sqlite.fossil

Reply on news.ycombinator.com