Using Apple File Merge or SourceGear DiffMerge I was able to compare the changes between each version without any of the earlier changes being skipped.
BEST DIFFMERGE FOR UNITY YOUTUIBE UPDATE
We don't have any specific timeline for these changes yet but we'll be sure to update our users when we have more information.įor what it's worth, I tried to reproduce your second issue with both 2017.1.1f.2.0f3 but wasn't able to run into it. We are aware of this limitation and plan to make improvements down the line. To your first concern, you're right that our current design doesn't make it easy for you to view specific changes (outside of what files have been modified) before you pull them. Person's 1 change is just gone and no conflict was ever raised.Ĭlick to expand.I understand. Its almost as if it only wanted to compare with the original change only and not future changesĢa) Both people edited a for loop in the same file (this is immediatly after that first test scenario)Ģb) Person 1 changed the for loop to be from i=0 to i=1Ģc) Person 2 changed the for loop to be from i=0 to i=4Īt this point there was no conflict and the value in the file was i=4
BEST DIFFMERGE FOR UNITY YOUTUIBE CODE
These changes are going to be called A (person 1) and B (person 2)ġc) Person 2 saw the publish and did an update creating a conflictġd) Person 2 resolved the conflict and put a new comment into the code to show it was resolvedġe) Person 1 made another change in the same placeġf) Person 2 (who has not done any publishing at this point) sees this new change and does an updateġg) Person 2 sees a conflict but instead of the conflict being between his resolution of the first conflict, and the new change, its between the original B change and the new change. #21281 includes this idea, but was never split up into different issues.2 more things I found while evaluating conflicts between 2 peopleġa) Both people touched a function in some file.
Documentation Availability & Testing What does success look like, and how can we measure that? What is the type of buyer? Is this a cross-stage feature? Links / references If done via a config file in the repo, no impact to permissions. All other members with access to the project should be able to see them. If done via the UI, maintainers+ should be able to modify these ignore rules. If an MR includes modifications to these files, they appear collapsed at the bottom of the list of changes, under some kind of group title (probably the name associated with the path specs).
Include in the project configuration (either in the UI or in a special dot-file in the repo) a set of path specs that should be ignored in MRs. They should be made aware that changes to these files have been made, and be able to review them if they wish, but they shouldn't get in the way of a normal review.
The user should be able to review an MR without having to click "collapse" on each of potentially hundreds of generated files, or vendored dependencies. Cameron (Compliance Manager) - cares about peer review occurring properly, which the current behaviour harmsĪlmost all of the other personas may want to review MRs, so this applies to them too.As a merge request reviewer, I want to have non-human-modified files collapsed or otherwise out of the way, so that I can review the human-made changes in the MR and not have to wade through pages of changes to auto-generated code.
0 kommentar(er)
