Hi Michael. best not to 'hijack' an already confused thread.
Yes triangular is not well explained, nor agreed on. A) there are two variants: 1) send changes via email patches (used by git itself), 2) send and accept changes via PR on a central server, Github style. Neither is perfect. Horses for courses... see also `$ git help workflows` (and tutorial and user-manual) B) double loop triangular, like Git for Windows - This is where there is three layers, and the middle layer must follow the upper layer, while still being a reference to the lower layer. This sounds like some of your description, though maybe the same as the Upstream git maintainers workflow (nuances of the description) Dscho (GfW maintainer) uses the new rebase option to allow reworking of a large 'thicket' of intermediate changes, that is rebased every release. On Saturday, May 16, 2020 at 8:55:53 PM UTC+1, Michael Gersten wrote: > > So looking up on Google and the various hits, "git triangular workflow", I > saw several different articles describing several different methods, all > rather old articles. > > What is the "best" current practices, with the features in current git, to > support the "triangular" workflow consisting of: > > 1. A "master" public version and repository. > 2. A personal version and repository. > 3. Being able to send pull requests to the "authority" repository. > > Bonus points for handling (kinda important): > 1. Local base changes needed to run on local system, that will *NOT* be > pushed. > (Examples: changing a base URL to my address instead of the official > address. > Changing a list of changelog text entries that describe what I've done > differently.) > > ... actually, that's the biggest obstacle I have -- once I've managed to > get my "base changes needed to run", I can't make clean pull requests. > ... Which tells me that I'm probably not doing the first 3 steps > correctly, as this has to be common enough for someone else to have solved > this. Right? > > --- > This message was composed with the aid of a laptop cat, and no mouse > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/13aaa9b1-6ae5-40d8-a246-ec95a5bdcf69%40googlegroups.com.
