On 2016-08-27, at 6:18 AM, Philip Oakley <philipoak...@iee.org> wrote:
> You said "submits a pull request from their master to your master -- which is
> as close to a "no-no" as I can imagine, I want their stuff to come in on a
> - I think in this case we fall into the trap of the accidental confusion of
> IIUC 'nominative determinism' (the name isn't the thing | cest ne pas une
> pipe). If they simply renamed their master branch to 'feature', it doesn't
> really change anything - it's the same sha1. If the merge-base is far away
> then perhaps its an issue and they should have rebased first;-).
> (Rhetorical) Maybe we need to have a Rose branch, which by any other name
> would smell just as sweet (I wonder if a patch to change master to Rose would
> be acceptable upstream ;-)
Actually, it's not even that.
In none of the git documentation on working with multiple users have I seen
what should be the first thing taught: How to control where someone else's
changes come in.
>From what I have seen in the docs -- reading the git manual, reading the pages
>on github about pull requests, and reading the git book -- if someone forked
>my repository, did work on "master", and submitted it to go onto my "master",
>then how do I say "No, come in on a branch named devB instead"?
** THAT SHOULD BE THE FIRST THING TAUGHT FOR WORKING WITH MULTIPLE DEVS **
The issue isn't that the Sha's are the same. Frankly, I'm not sure if the sha's
are the same.
Even if you were to teach me how to control where it comes in on my repository,
what happens when they try to then sync their repository with mine, given that
now our two master branches look nothing alike?
I don't have the slightest clue how to handle this.
If it is documented, it is the second most obtuse set of docs, only slighter
harder to find than "how to use the low-level plumbing commands". Note that I
can find the docs on those, just not how to put them all together.
Oh, wait -- someone wrote "Git from the bottom up". That probably explains how
to use them.
Entertaining minecraft videos
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
For more options, visit https://groups.google.com/d/optout.