-
Notifications
You must be signed in to change notification settings - Fork 0
002 06 15 2020 to 06 19 2020
Interfaced RefMiner with the IntelliJ refactoring API to undo rename method refactorings.
Set up a meeting with Ameya to discuss the dependency problem when using the refactoring API externally.
Add the rename variable refactoring to the application and use IntelliJ refactoring API externally.
Use RefMiner details to undo rename variable refactorings.
Met with Ameya about the dependency problem. Ameya suggested using Eclipse JDT and GumTree because IntelliJ is expensive and requires the user to have IntelliJ IDEA.
Prepare demo for Sarah and add more refactoring types.
Use RefMiner details to undo rename class refactorings.
Met with Sarah and discussed the tool that Git defaults to, we agreed that it's vimdiff3.
Use vimdiff3 to merge some merge scenarios and make sure it works, then choose merge scenarios for demo.
Used vimdiff3 and it does not provide the same output as git, it provides extra information. I looked into the git-config documentation and the default mergetool is myers. I investigated it and myers is actually diff2 (diff3 uses the form <<<< ours ||||| base ==== >>>> theirs). I checked how IntelliMerge merges and they default to diff2 as well for the actual merging process. The myers merge algorithm is also referred to as "merge".
Investigate the "merge" tool and find a couple of merge scenarios to demo on. Replay the refactorings after the merge.