News for hackers. Stuff that matters.

A comment on Stacked Git – manage commits as a stack of patches.

Re:Stacked Git – manage commits as a stack of patches by choeger on Thursday May 27, 2021 @01:39PM (#27305822)
That sounds extremely useful, indeed. What are the caveats/corner cases? I assume it does a lot of debasing behind the scenes, what happens in case if conflicts?
[ Parent | on HN ]
Re:Stacked Git – manage commits as a stack of patches by jpgrayson on Thursday May 27, 2021 @01:51PM (#27305951)
StGit maintainer here.

You are correct that conflicts can occur when pushing or reordering patches. These conflicts are resolved with the regular git mechanisms. I.e. conflict markers in files, use `git add` to mark conflicts as resolved, and then `stg refresh` to update the patch with conflicts resolved.

[ Parent | on HN ]