Collecting change sets to accept together should be from the same component

[jacobilsoe]

When collecting change sets to accept together in case of merge conflicts, only change sets from the same component should be accepted together.

[WtfJoke]

Yup, that would make sense to have that as an additional criteria.
What I wonder is, how do you know from which component the changeset is?

[jacobilsoe]

I guess it could be deduced from the history files - in those cases where they are supplied.

[WtfJoke]

No, because they history files only contain the uuids. I think to extend them just for this issue would be a little bit too much in my opinion. Maybe there is another way to determine the component of a changeset.

[jacobilsoe]

I was thinking of using the name of the history file since this name is made up of the stream name and component name.

[WtfJoke]

Ah 😅 Yeah I guess that would be possible'^^

[ohumbel]

I already started looking into this...

[ohumbel]

You can track what I am doing in this branch: https://github.com/ohumbel/rtc2git/tree/conflictresolution

[ohumbel]

Now after all this merging, I should be able to concentrate on this issue again.
However, I am in a different project for the next 2 days.

[jacobilsoe]

Let me know if I can help with anything.

[ohumbel]

Uh oh an Xcode update on my mac unset my --local user.name and user.email.
But my .ssh key of course is still valid.
Please apologise for 2 commits with 'anyAuthor'.
I think it is not worth rewriting the whole history because of that (see https://help.github.com/articles/changing-author-info/)

[ohumbel]

@jacobilsoe I would be very glad if you could verify your use case(s) with my 'conflictresolution' branch (https://github.com/ohumbel/rtc2git/tree/conflictresolution). I am pretty confident that it will work, but have no live data (yet) to test it myself.
If you are satisfied with the result, we can create a pull request and merge it into develop.

[WtfJoke]

Please apologise for 2 commits with 'anyAuthor'.
I think it is not worth rewriting the whole history because of that (see https://help.github.com/articles/changing-author-info/)

No problem^^ Happens fast.