Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

[14:14:01 CDT(-0500)] <EricDalquist> yeah

[14:44:35 CDT(-0500)] <athena> what does this error message mean? "Your merge target has changed since viewing this pull request - try the merge again"

[14:45:03 CDT(-0500)] <EricDalquist> from github?

[14:45:13 CDT(-0500)] <athena> yeah, while trying to merge a pull request

[14:45:31 CDT(-0500)] <EricDalquist> perhaps there was a commit made to the target branch between when you opened the pull request page and when you clicked merge?

[14:46:05 CDT(-0500)] <athena> doesn't seem to be

[14:46:30 CDT(-0500)] <athena> maybe try a force-refresh

[14:46:35 CDT(-0500)] <athena> wasn't sure if you'd seen that before

[14:46:55 CDT(-0500)] <athena> huh, now it's working

[14:47:00 CDT(-0500)] <athena> wonder if something was goign on the server

[14:47:04 CDT(-0500)] <athena> was being really slow, too

[14:47:09 CDT(-0500)] <athena> now back to it's happy speedy self

[14:47:20 CDT(-0500)] <EricDalquist> weird