Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
ryanpetrich
on June 18, 2013
|
parent
|
context
|
favorite
| on:
Repository Next
Using the command line, that would be a merge conflict. If SourceTree is treating it as a successful merge, that would be a bug.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
