[Infrastructure] GitHub Training
bwilson at mozilla.com
Thu Aug 6 16:15:05 MST 2020
Thanks! So I updated the branches in my repository and it worked.
On Thu, Aug 6, 2020 at 4:23 PM Ryan Sleevi <sleevi at google.com> wrote:
> On Thu, Aug 6, 2020 at 3:18 PM Ben Wilson <bwilson at mozilla.com> wrote:
>> I definitely think Github training would help. Thanks, Jos.
>> For example, I know how to do a "compare" between the main branch and a
>> proposed ballot when there aren't that many differences between the two.
>> But I ran into trouble today when I tried to do another comparison. See,
>> as example of what an ordinary user like me might encounter:
> In the meantime, prior to any training, you should be able to find the
> answer at https://wiki.cabforum.org/github_redline_guide . I believe the
> cause of your error is addressed at the "2) Your repo is not in sync, and
> you can automatically merge" section.
> Indeed, with an extra '.' involved, the differences become a little
> easier to see: That is, from
> The reason for the difference in displays has to do with the common
> merge-base: the cabforum/main has added additional changes since you
> originally created your branch, and so when you do the "two-dot" compare
> using the cabforum/main repository, it's comparing (everything in
> cabforum/main since your last branch point) + (everything your branch since
> your branch point). The "three-dot" compare instead does (everything in
> your branch since your branch point) - that is, it works to find the
> "common ancestor" of the commit you specified on the left hand side (the
> current cabforum/main) and the commit on the right hand side (your branch),
> and then shows what's different in your branch *from that common ancestor*.
> This is covered a bit at
> Normally, if your branch is in sync with cabforum/main, the two-dot
> compare and the three-dot compare are identical, and that's why our wiki
> says "use the two-dot compare". That they're different is because of your
> branch being a few commits "behind" main. If you follow the steps on the
> wiki, you should get back in sync.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Infrastructure