we're all using source tree. I'm really interested to try and
reproduce this so I'll find some time today to do it.
Thanks again
On Fri, Jun 27, 2014 at 6:56 AM, Jeremy Scott wrote:
> Hi. Thanks for getting back to me.
>
> here is a screenshot from source tree t
, Philip Oakley wrote:
> From: "Phil Hord"
>
>> On Mon, Jun 23, 2014 at 9:15 PM, Jeremy Scott
>> wrote:
>>>
>>> I just encountered a situation where a merge was made, with no
>>> apparent changes in files (ie no log), but the result was that
I just encountered a situation where a merge was made, with no
apparent changes in files (ie no log), but the result was that some
files were deleted.
person A adds some files
person B adds some files from the same point
person B commits and pushes.
person A commits -- now merge is required
a fe
3 matches
Mail list logo