[Vm-dev] Need an Alien-Core-eem.102 update

[Levente Uzonyi]

Hi Ben!

On Wed, 15 Jan 2020, Ben Coman wrote:

> 
> On Wed, 15 Jan 2020 at 01:18, Ben Coman <btc at openinworld.com> wrote:
>>
>>

snip

>>
>>
>> So naive question... How does Monticello deal with such a situation between b3 & b4?
>>
>> Left as an exercise is pushing branches b3 & b4 to a git-service-provider,
>> then issue a PR merging b3 into master, followed up a PR merging b4 into master.
>>
>> If you can work out how to easily get such timestamp merge conflicts to AUTO RESOLVE
>> on the remote git server used to merge PRs (i.e. GitHub, GitLab, etc),

Why do you want these to "AUTO RESOLVE"?
If the same method is modified in two different branches, it's a must to 
check whether those changes are compatible or not, isn't it?


Levente

>> in a way compatible with libgit, there may be a better case for calling B.S. on Tonel's lack of timestamps.
>>
>> I do remember watching the Pharo community struggle for many months with the above issue
>> and it was really impeding git uptake by users.  I know I got burnt and I didn't transition to using git from within Pharo until it was resolved by Tonel.
>> My memory of mail list discussions was that the decision to drop timestamps wasn't taken lightly,
>> but seemed like the only practical way to move forward into a git world.
>>
>> HTH,
>> cheers -ben
>>