[Kotlin Cleanup] CardTemplateEditor

[oyeraghib]

Purpose / Description

[Kotlin Cleanup] CardTemplateEditor

Checklist

• [x] You have not changed whitespace unnecessarily (it makes diffs hard to read)
• [x] You have a descriptive commit message with a short title (first line, max 50 chars).
• [x] Your code follows the style of the project (e.g. never omit braces in if statements)
• [x] You have commented your code, particularly in hard-to-understand areas
• [x] You have performed a self-review of your own code
• [ ] UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
• [ ] UI Changes: You have tested your change using the Google Accessibility Scanner

[Arthur-Milchior]

You have a conflict.

Given that I agreed with a remark you made and have a conflict, I'll wait until you resolve it and let me know whether you are done before reviewing again this commit

[oyeraghib]

You have a conflict.

Given that I agreed with a remark you made and have a conflict, I'll wait until you resolve it and let me know whether you are done before reviewing again this commit

I fixed the conflict. It was due to the change in variable names.

[oyeraghib]

@Arthur-Milchior I made the required changes, but I see that there are few conflicts. If I try to resolve these conflicts using Resolve conflicts here on GitHub I might end up merging them. But you said I should rather do rebase instead of merging. May I please know how do I do that here?

[Arthur-Milchior]

Admittedly, I'm sorry, I fear it must be done on computer.

You can simply do git pull --rebase from command line, so that the pull is done with rebasing onto ankidroid's main (if you track it)

You can also do git config pull.rebase true to ensure that all pull are done with rebase.

If your local branch is not tracking ankidroid/main, you can also do git rebase ankidroid/main (assuming the remote from ankidroid is called ankidroid. If it is called "origin" then replace "ankidroid" by "origin")

Once everything is merged, you can do git push --force-if-includes to push back to the pull request.

You may want to do git config rerere.enabled true first. This ensure that if you have the same conflict many time, you only have to solve it once. I doubt it'll be a problem with this PR, but when you have huge PR it can sometime help

[github-actions[bot]]

Hello 👋, this PR has been opened for more than 2 months with no activity on it. If you think this is a mistake please comment and ping a maintainer to get this merged ASAP! Thanks for contributing! You have 7 days until this gets closed automatically