API tools faq
paste
Guest User

Untitled

a guest
May 27th, 2018
82
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.28 KB | None | 0 0
raw download clone embed print report
  1. C:\Users\Mel\Projects\BrainBank>git merge email_delivery
  2. error: Untracked working tree file 'Capfile' would be overwritten by merge.
  3. fatal: merging of trees fd6c49ed7eb449ffc373ce8c45de28e4dc3520ca and 4b834787dd5a7c8d6c360463d7741f10ffb79893 failed
  4. Merge with strategy recursive failed.
Add Comment
Please, Sign In to add comment
Public Pastes
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!