Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow editing method source for merge conflicts #339

Open
3 tasks
codeZeilen opened this issue Jul 17, 2021 · 0 comments
Open
3 tasks

Allow editing method source for merge conflicts #339

codeZeilen opened this issue Jul 17, 2021 · 0 comments

Comments

@codeZeilen
Copy link
Member

codeZeilen commented Jul 17, 2021

For merge conflicts, it would be nice to be able to edit the source code of a conflicting method and create the merged version manually.

Current state is at branch Squot/swa-chooseAnother:.

Considerations:

  • Do not forget that the same protocol also should work for non-package artifacts (see SquotConflict)
  • The current solution based on SquotMergeDiffNode>>#editTo: might still turn out to be incomplete, if it turns out that we also have to change the incoming snapshot. If this happens, more fundamental discussions become necessary.
  • SquotMergeDiffNode instances are UI objects that represent the state of the SquotMergeTool and not any underlying version control semantic
  • Beware of modifications to code artifacts other than methods, scripts should probably work, class definitions might be over the top at this point

Remaining todos

  • Think about selector for SquotMergeDiffNode>>#editTo:
  • Add an editor to the SquotMergeTool
  • Add the new timestamp when editing a method in the SquotMergeTool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant