Git

3221 readers

29 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

Follow programming.dev rules
Be excellent to each other, no hostility towards users for any reason
No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 2 years ago

MODERATORS

Ategon

canpolat

jnovinger

How the GitHub CLI can now enable triangular workflows (github.blog)

submitted 1 day ago* (last edited 1 day ago) by Kissaki to c/git

6 comments fedilink hide all child comments

For those familiar with Git terminology:

The simplest way to assemble a triangular workflow is to set the branch’s merge key to a different branch name, like so:
[branch “branch”]
   remote = origin
   merge = refs/heads/default
This will result in the branch pullRef as origin/default, but pushRef as origin/branch, as shown in Figure 9.

Working with triangular forks requires a bit more customization than triangular branches because we are dealing with multiple remotes. […]

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 6 points 1 day ago (4 children)

Sorry, I'm a square.

[–] [email protected] 4 points 1 day ago* (last edited 1 day ago) (3 children)

No, you're the letter j

Anyways, I'm assuming you don't understand what the triangular workflow is (if i assumed wrong, ignore this)? Imagine you want to make an improvement to Lemmy. You got to github.com/lemmynet/lemmy, you fork that repository and you add your improvement. Now you can't just push you improvement back to that repository, because you don't have the rights to push to that repository. So you have to make your own repository at github.com/theletterj/lemmy and make a nerge request to github.com/lemmynet/lemmy to merge your improvement.

That is the triangle. You have to pull from github/lemmynet, but push to guthub/theletterj and send a merge request back to github/lemmynet

[–] Colloidal 3 points 12 hours ago (1 children)

How is that different from sending a PR?

[–] [email protected] 4 points 10 hours ago (1 children)

For a single PR it's pretty much the same, but if you have multiple back and forth, you'd have to set up multiple remotes and switch between them. Now you don't. If I understand it correctly, you can now just "git pull" from repo1 and "git push" to repo2

[–] [email protected] 2 points 7 hours ago

Not oc, but thank you for explaining

load more comments (1 replies)