GitSync Pro 🚀
Automatically detect and fix Git sync issues with one click!
Tired of git merge conflicts, diverged branches, detached HEAD states, and all those confusing upstream tracking errors? GitSync Pro analyzes your repository in real-time and fixes problems automatically or with a single click.
✨ Key Features
🎯 One-Click Auto-Fix All
- Click the status bar to automatically resolve all Git issues in the correct sequence
- No prompts, no manual git commands—just fixes
- Problems solved intelligently based on dependencies
🧠 Smart Issue Detection
- Merge/Rebase Conflicts: Auto-aborts blocking operations
- Detached HEAD: Auto-checks out main/master branch
- Missing Upstream: Auto-sets upstream tracking to origin
- Diverged History: Auto-pulls with intelligent rebase strategy
- Behind/Ahead Remote: Auto-pulls and pushes accordingly
- Dirty Worktree: Auto-stashes changes, then restores them after sync
- Merge Conflicts: Auto-resolves using current branch version
📊 Live Status Bar
- See your Git health at a glance
- Click to auto-fix all issues instantly
- Real-time analysis and progress feedback
- Status updates every 10 minutes (configurable)
- View all detected issues with severity levels (error/warning/info)
- Inline "Fix" buttons for individual issues
- Detailed explanations for each problem
- Color-coded icons for quick scanning
🔄 Multiple Sync Strategies
- Auto-Fix All: Solve everything with one click
- Smart Fix: Cherry-pick which issues to fix manually
- Sync Now: Intelligently pull/push based on branch state
- Analyze Repository: Deep Git health scan with fetch
📚 Error Explanations
- Run "Explain Last Error" to understand what went wrong
- Helpful hints for troubleshooting
- Clear guidance on next steps
🚀 Quick Start
Installation
- Install GitSync Pro from the VS Code Marketplace
- Open a Git repository in VS Code
- Look for the GitSync Pro icon (sync icon) in the Activity Bar
One-Click Fix (Recommended) ⚡
- GitSync Pro automatically analyzes your repo on startup
- If issues are found, see them in:
- Status Bar:
$(error) GitSync main: X issue(s) - Click to auto-fix
- Sidebar: View detailed issue list with inline fix buttons
- Click the status bar → All issues fixed in seconds! ✅
- Open GitSync Pro from the Activity Bar
- View all detected issues organized by severity
- Click inline "Fix" button on any issue
- Or use the status bar to fix everything at once
Command Palette Options
Press Ctrl+Shift+P (or Cmd+Shift+P on Mac) and type "GitSync":
GitSync Pro: Auto-Fix All Issues (One-Click) — Fix everything automaticallyGitSync Pro: Smart Fix — Choose which issues to fixGitSync Pro: Sync Now — Manual sync with smart detectionGitSync Pro: Analyze Repository — Deep scan with fetchGitSync Pro: Explain Last Error — Get detailed error info
📋 What It Detects & Fixes
| Issue |
Detection |
Auto-Fix |
| Not a Git repository |
✅ |
❌ (requires manual init) |
| Detached HEAD |
✅ |
✅ Auto-checkout main/master |
| No upstream branch |
✅ |
✅ Auto-set to origin |
| Behind remote |
✅ |
✅ Auto-pull |
| Ahead of remote |
✅ |
✅ Auto-push |
| Diverged history |
✅ |
✅ Auto-pull with rebase |
| Merge conflicts |
✅ |
✅ Auto-resolve + commit |
| Dirty worktree |
✅ |
✅ Auto-stash + restore |
| Merge in progress |
✅ |
✅ Auto-abort to unblock |
| Rebase in progress |
✅ |
✅ Auto-abort to unblock |
| Cherry-pick in progress |
✅ |
✅ Auto-abort to unblock |
⚙️ Configuration
Open VS Code Settings and search for GitSync Pro:
| Setting |
Type |
Default |
Description |
| Auto Detect on Startup |
Boolean |
true |
Automatically check repository when VS Code opens |
| Auto Detect Interval |
Number |
10 |
Minutes between periodic health checks (0 = disabled) |
| Show Status Bar |
Boolean |
true |
Display live Git health in the status bar |
🎯 Auto-Fix Priority Sequence
When you click "Auto-Fix All," issues are resolved in this intelligent order:
- Blocking Operations (Merge/Rebase/Cherry-pick)
- Merge Conflicts (Auto-resolved with safe strategy)
- Detached HEAD (Auto-checkout)
- No Upstream (Auto-set)
- Diverged History (Pull with rebase)
- Behind Remote (Auto-pull)
- Ahead of Remote (Auto-push)
- Dirty Worktree (Auto-stash)
🛡️ Safety Features
- Auto-Stash Protection: Uncommitted changes are automatically stashed before risky operations and restored afterward
- Conflict Resolution: Uses "current branch" version to safely auto-resolve conflicts
- Error Recovery: Continues fixing other issues even if one fails
- Progress Feedback: Real-time notifications show what's happening
- Detailed Logging: Original Git errors available via "Explain Last Error"
🐛 Troubleshooting
"Please clean your repository working tree before checkout"
✅ Solution: GitSync Pro auto-stashes your changes and restores them—all work is preserved!
Authentication failed / Permission denied
✅ Solutions:
- Check your Git credentials and SSH keys
- Verify remote URL and repository permissions
- For HTTPS: Update stored credentials in VS Code
- For SSH: Ensure your public key is added to GitHub/GitLab
Network errors / "Could not resolve host"
✅ Solutions:
- Check your internet connection
- Verify firewall/VPN settings
- Try again after network is stable
✅ Solution: Click status bar → Auto-Fix All → Upstream automatically set!
Extension not detecting issues
✅ Solutions:
- Manual trigger: Run
GitSync Pro: Analyze Repository
- Check auto-detect interval in settings
- Ensure you have a Git repository open
- Verify Git is installed:
git --version in terminal
💡 Pro Tips
✅ Enable auto-detect to catch issues as they happen
✅ Use the sidebar for a detailed issue breakdown
✅ Click status bar for instant one-click fix
✅ Set interval to 5 minutes for real-time monitoring
✅ Disable status bar if you prefer sidebar-only view
✅ Use "Explain Last Error" for debugging failed operations
🎓 Common Git Scenarios
"My branch has diverged—what do I do?"
→ Click status bar → Auto-Fix All → GitSync Pro pulls with rebase to reconcile history safely
"I accidentally made commits on detached HEAD"
→ Open sidebar → Watch GitSync Pro detect it → Click Fix → Auto-checkout to main/master
"I forgot to set upstream tracking"
→ Try to push → GitSync Pro detects → Click Fix → Upstream set to origin automatically
"I have merge conflicts and dirty changes"
→ Click Auto-Fix All → Auto-stashes your work → Resolves conflicts → Restores everything
📊 Extension Details
- Category: SCM Providers
- Requirements: VS Code 1.110.0+, Git installed
- Size: Minimal (~500KB with dependencies)
- Performance: Non-blocking, runs in background
- Privacy: All operations are local to your repository
🙋 FAQ
Q: Will this delete my code?
A: No! All operations preserve your work. Dirty changes are stashed and restored.
Q: Does it work with GitHub, GitLab, Bitbucket?
A: Yes! Any Git remote works with GitSync Pro.
Q: Can I undo a fix?
A: Yes! Use Git's undo commands or your VS Code timeline.
Q: Does this replace Git knowledge?
A: No—GitSync Pro handles common issues. For advanced workflows, use Git directly.
Q: Is it safe for production branches?
A: Yes! Uses safe strategies (auto-rebase, no force-push, current-branch conflict resolution).
📄 License
MIT
🙏 Credit
Made with ❤️ for developers tired of Git headaches.
Let GitSync Pro handle the Git mess. You focus on coding. 🚀
