API tools faq
paste
Advertisement
mugs

NWUKFS-2586 merge error

mugs
Sep 9th, 2015
143
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.39 KB | None | 0 0
raw download clone embed print report
  1. An internal error occurred during: "Merging with refs/heads/NWUKFS-2586".
  2. Exception caught during execution of merge command. org.eclipse.jgit.errors.NoMergeBaseException: No merge base could be determined. Reason=CONFLICTS_DURING_MERGE_BASE_CALCULATION. "More than 200 merge bases for:
  3. a f76b659e6f41de57c5bc32ca8d114634998c72f4
  4. b 14af393b5096a7ded1a774b601834aeb7ffe1a14 found:
  5. count 3"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!