News for hackers. Stuff that matters.

A comment on Terraform is currently not reviewing community pull requests. Parent comment

Re:Terraform is currently not reviewing community pull requests by arthurcolle on Sunday September 05, 2021 @06:45PM (#28428484)
So then when your upstream repo diverges would you just rebase and manually add in anything you want from the forked development tree on the upstream side?

Not sure what's best practice so... just curious how people have handled this - I usually leave my forks of stuff pretty stale and focus on my own little sub-pieces to achieve what I want but not too much else.

[ Parent | on HN ]
Re:Terraform is currently not reviewing community pull requests by acidbaseextract on Sunday September 05, 2021 @09:39PM (#28429421)
Maintaining the fork as a stack of patches using something like Stacked Git can make it a little easier than rebasing: https://stacked-git.github.io/
[ Parent | on HN ]
Re:Terraform is currently not reviewing community pull requests by dharmab on Sunday September 05, 2021 @09:33PM (#28429395)
Yes, we would branch from upstream again and apply the patch set against the new branch. Normally it is trivial but once in a while there are manual changes necessary.
[ Parent | on HN ]
Re:Terraform is currently not reviewing community pull requests by rad_gruchalski on Sunday September 05, 2021 @08:22PM (#28429061)
I usually have my own branch which can be used to get a diff and maintain the diff on any major code structure change. Most often there is not much hassle but can be annoying.
[ Parent | on HN ]