Versions Compared

Old Version 37

changes.mady.by.user Apereo Infrastructure

Saved on

compared with

New Version 38

changes.mady.by.user Apereo Infrastructure

Saved on

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?