Hacker News new | ask | show | jobs
by riquito 803 days ago
What strategy do you use for conflicts during the rebase of renovate_updates? (which most of the time would occur because you eagerly updated something on dev)?
1 comments

That’s a good point. My repo doesn’t change that often. But for me the source of truth is always dev.