Git Usage Guide for PyCharm

PyCharm Git Integration

1. Enable Version Control:
   • Go to VCS → Enable Version Control Integration
   • Select "Git" from the dropdown menu
2. Commit Changes:
   • Use Alt+0 (Command+0 on Mac) to open the Commit tool window
   • Select changed files to commit (e.g., Forager.pm)
   • Write a descriptive commit message (e.g., "Add Forager controller for handling forager.com routes")
   • Click "Commit" or "Commit and Push"

Common Workflows

Adding New Features to Production

1. Create a New Branch:

   git checkout -b feature/forager-controller

2. Add and Commit Changes:

   git add Forager.pm
   git commit -m "Add Forager controller for handling forager.com routes"

3. Push to Remote:

   git push origin feature/forager-controller

4. Deploy to Staging for Testing:
   • Use your deployment tool to push to staging environment
   • Test thoroughly for correct site information and route handling
5. Merge to Development/Staging:
   • Create a Pull Request if using GitHub or similar
   • Or directly merge:

     git checkout development
     git merge feature/forager-controller

6. Final Test on Staging:
   • Re-run tests to ensure no issues post-merge
7. Merge to Production:

   git checkout production
   git merge development
   git push origin production

8. Monitor Post-Deployment:
   • Watch for any live site issues

Remove .idea Directory from a Git Branch

1. Fetch the branch from the remote repository:

   git fetch origin branch_name:branch_name

2. Remove the .idea directory from your local working directory:

   rm -rf .idea

3. Switch to the fetched branch:

   git checkout branch_name

4. Remove the .idea directory and commit the change:

   git rm -r .idea
   git commit -m "Remove .idea directory"

5. Push the changes to the remote branch:

   git push origin branch_name

Replace branch_name with the name of the branch you want to remove the .idea directory from.

Troubleshooting Common Issues

• If PyCharm doesn't detect Git:
  1. Go to Settings/Preferences → Version Control → Git
  2. Verify the path to Git executable