How to synchronize with upstream opensource project while keeping your own private modified version?

Question

I am working on a forked version of a open-source project which is written in golang. The problem is, while I do some modifications in my private repo, I realised that the opensource also releases important modifications to the project.

When I do merge from upstream, there are huge amount of conflicts to solve. Then, I decided to move my private logic, modifications, to separate files and added new functions and embedding structs(in golang terms). Now conflicts are much lesser. But still I have to check those modified functions manually.

Any better approach to tackle this task? How big tech companies do this in production? Maybe setup a CI/CD to do this automatically and solve conflicts automatically? Any ideas appreciated. Thank you.

Can you just submit your changes upstream? IME big tech companies may be willing to directly sponsor the open-source project, and there are also prominent examples of big tech companies forking open-source to avoid this. — David Maze
– David Maze, Commented Sep 19, 2024 at 15:06
I am using my private fork for private server deployments. Modifications means changing security logic, API and etc. which is not needed for open-source project — Ish Rj95
– Ish Rj95, Commented Sep 19, 2024 at 15:18

Ngaox Thao · Accepted Answer · 2024-09-19 15:12:04Z

0

Did you try to use rebase? I used rebase instead of merge to make less of conflict. When you merge, it combines all of branch changes. In contrast, rebase takes your changes, and put them on the top of latest upstream commit.I got this when I read the document about comparing merge and rebase.

answered Sep 19, 2024 at 15:12

Ngaox Thao

728 bronze badges

Sign up to request clarification or add additional context in comments.

3 Comments

Ish Rj95 Over a year ago

If you have couple changes, couple commits, it works. But when it comes to the new files, lots of modifications, merge looks easier than rebase.

Ngaox Thao Over a year ago

Yeah, i agree with you. Merge is easier but rebase has its benefit. When rebasing we can follow the project's flow which is very helpful for me.

Ngaox Thao Over a year ago

I also search for the solution you ask, the big tech company they use microsevice

Collectives™ on Stack Overflow

How to synchronize with upstream opensource project while keeping your own private modified version?

1 Answer 1

3 Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

3 Comments

Your Answer

Sign up or log in

Post as a guest

Related