API tools faq
paste
Guest User

Untitled

a guest
Jan 16th, 2018
76
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.40 KB | None | 0 0
raw download clone embed print report
  1. >git pull origin dev
  2. From https://scm.starbucks.com/roastery-milan/choreographer
  3. * branch dev -> FETCH_HEAD
  4. CONFLICT (modify/delete): <file name omitted> deleted in HEAD and modified in 01b734b9ae8594f03f5e481b123d80e41fb54d7c. Version 01b734b9ae8594f03f5e481b123d80e41fb54d7c of <file name omitted> left in tree.
  5. ...
  6. Automatic merge failed; fix conflicts and then commit the result.
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!