Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Udyzr ch5 integration mgr wflw #1255

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

udyzr
Copy link

@udyzr udyzr commented May 15, 2019

No description provided.

udyzr and others added 3 commits May 13, 2019 23:09
* Fix: Inspecting commits made on topic branch since...

common ancestor with main branch.

Issue detected and fixed by consulting git-revisions manual page
(used git version is 2.21.0):
 <rev1>...<rev2> - Include commits that are reachable from either <rev1> or <rev2>
 but exclude those that are reachable from both...
 <rev1>..<rev2> - Include commits that are reachable from <rev2>
 but exclude those that are reachable from <rev1>...

* Fix referring to

* Fix reference to 'double-dot'
* mention explicitly existence and usage of developer
  private / local repository
* match possesive to used personal pronounce
* fill small gaps in description
@@ -39,15 +39,16 @@ With Git's branching model, it's possible for hundreds of developers to successf
(((workflows, integration manager)))
Because Git allows you to have multiple remote repositories, it's possible to have a workflow where each developer has write access to their own public repository and read access to everyone else's.
This scenario often includes a canonical repository that represents the ``official'' project.
To contribute to that project, you create your own public clone of the project and push your changes to it.
Each developer has also own private repository for conducting changes in workspace then committing.
To contribute to that project, you create your own public clone of the project and push your changes to it from your private repository.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exactly. If you fork a public repo, your fork is public as well. The "private repo" in the diagram is the one on your computer. At this point in the book the reader is familiar with making changes in a local repo and pushing to a remote, so there's no need to spell it out. IMO the original wording is more clear.

Copy link
Author

@udyzr udyzr May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cit. "At this point in the book the reader is familiar with making changes in a local repo.." that's can be well true. Will it also be clear here for book reader private repositories are being used in workflow being elaborated? The more gaps the book's reader needs mentally to fill by themselves - while on journey with this book - the more distant reader's arrival at their destination.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, how about this then:

Each developer has also their own private repository (on their own machine) for authoring commits.
To contribute to that project, you would create your own public clone of the project, and push your changes to it from your private repository.

2. A contributor clones that repository and makes changes.
3. The contributor pushes to their own public copy.
4. The contributor sends the maintainer an email asking them to pull changes.
2. A contributor clones that repository and makes then commits changes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
2. A contributor clones that repository and makes then commits changes.
2. A contributor clones that repository and commits changes.

Copy link
Author

@udyzr udyzr May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Text before PR mentions - in explicit way - making changes in point 2 so how about retaining it there?
Mental shortcuts are good when in circle of two or more of same knowledge / experience level. Here book's author(s) with deep Git expertise is(are) talking to Git newbies - one needs to be cautions with usage of mental shortcuts.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By that logic, we should be including paragraphs with every numbered point here. This isn't meant to be an exhaustive list of commands the user needs to type in, and readers at this point should know that they can't make commits without making changes. Remember, this is chapter 5, and the reader should be pretty comfortable working with a local repository at this point.

book/05-distributed-git/sections/distributed-workflows.asc Outdated Show resolved Hide resolved
book/05-distributed-git/sections/distributed-workflows.asc Outdated Show resolved Hide resolved
3. The contributor pushes to their own public copy.
4. The contributor sends the maintainer an email asking them to pull changes.
4. The contributor sends the maintainer an email asking therein to pull changes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This parses weirdly to a native English reader. Can I ask what you found objectionable about my suggestion?

The contributor sends an email asking the maintainer to pull changes.

@progit progit deleted a comment May 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants