Hello, I have created a light fork of an upstream project and I am not quite sure which "syncing with upstream" workflow fits better. I can think of 3 solutions 1. the obvious one, merge the upstream changes on the forked branch and make the necessary modifications on the merge commit 2. Rebase upstream commits on top of the fork & make a commit with the necessary modifications 3. Cherrypick & modify upstream commits Which practice is considered better? thanks, chris -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html