If two people are working on the same module and using the same repository, and I generate some code and ask the AI to assist with it, while the other person generates their own code and asks the AI to make changes in the same class (such as modifying variables or datatypes), how can we handle the integration of both contributions?
For working on the same module with AI-assisted changes, I’d recommend using Git branches to keep the changes separate initially. Each person can work on their own branch, use Cursor’s AI features freely, then merge the changes together through a PR
You can use the @Git command in Cursor to analyze the changes and spot potential conflicts before they happen. This should make it easier to see how the variable/datatype changes might affect each other
When you’re ready to merge, do a standard code review process where both devs can see how the AI-generated changes will work together