<div dir="ltr">Thanks!  So I updated the branches in my repository and it worked.  <a href="https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..f4da025a101eb08f2786202458b42520d683ccf9">https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..f4da025a101eb08f2786202458b42520d683ccf9</a></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Aug 6, 2020 at 4:23 PM Ryan Sleevi <<a href="mailto:sleevi@google.com">sleevi@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Aug 6, 2020 at 3:18 PM Ben Wilson <<a href="mailto:bwilson@mozilla.com" target="_blank">bwilson@mozilla.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>I definitely think Github training would help.  Thanks, Jos.</div><div>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: <a href="https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0" target="_blank">https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0</a></div></div></blockquote><div><br></div><div>In the meantime, prior to any training, you should be able to find the answer at <a href="https://wiki.cabforum.org/github_redline_guide" target="_blank">https://wiki.cabforum.org/github_redline_guide</a> . I believe the cause of your error is addressed at the "2) Your repo is not in sync, and you can automatically merge" section.</div><div><br></div><div>Indeed, with an extra '.' involved, the differences become a little easier to see: That is, from <a href="https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0" target="_blank">https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d..db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0</a> to <a href="https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d...db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0" target="_blank">https://github.com/cabforum/documents/compare/5f804ccd4a202036a9868d1c43849e43e4c4853d...db4c4af7c01ea815a21bc314fab6cdc4eec7e9f0</a></div><div><br></div><div>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 <a href="https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-comparing-branches-in-pull-requests#three-dot-and-two-dot-git-diff-comparisons" target="_blank">https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-comparing-branches-in-pull-requests#three-dot-and-two-dot-git-diff-comparisons</a></div><div><br></div><div>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.</div></div></div>
</blockquote></div>