fix(git): set vscode as default mergetool, remove fugitive#58
Conversation
mergiraf is a merge driver (automatic), not a mergetool (interactive). Setting merge.tool = mergiraf was incorrect and caused unexpected fallback behaviour. Set merge.tool = vscode for manual conflict resolution. Also removes the redundant fugitive mergetool (a vim plugin that duplicates nvim functionality) and its fugmerge alias. Closes #45
Summary of ChangesHello @chicham, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refines the Git configuration to ensure proper handling of merge conflicts. It corrects an erroneous Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request correctly fixes a misconfiguration in the git settings by changing the default merge tool from mergiraf to vscode, as mergiraf is a merge driver and not an interactive mergetool. The changes also include removing the redundant fugitive mergetool and its associated alias, which cleans up the configuration. The changes are logical, well-explained, and improve the correctness and maintainability of the git configuration. I have no further suggestions.
Summary
merge.tool = mergirafwas incorrect: mergiraf is a merge driver (automatic), not a mergetool (interactive). Setting it asmerge.toolcaused unexpected fallback behaviour.merge.tool = vscodefor manual conflict resolution when mergiraf cannot auto-resolve.[mergetool "fugitive"]— redundant (duplicates nvim via a vim plugin).fugmergealias.The
[merge "mergiraf"]driver configuration is unchanged.Closes #45