Add git workflow instructions

Author: shoumikchow

CONTRIBUTING.md

@@ -98,6 +98,61 @@ Ready to contribute? Here's how to set up `bbox_visualizer` for local developmen
 
 9. Submit a pull request through the GitHub website.
 
+## Git Workflow
+
+### Feature Development
+
+1. Create feature branch from dev:
+    ```bash
+    git checkout dev
+    git pull origin dev
+    git checkout -b name-of-your-bugfix-or-feature
+    ```
+
+2. Make your changes and follow the code quality steps above (formatting, linting, testing)
+
+3. Create a Pull Request from your feature branch to dev
+
+4. After your feature PR is merged to dev, create a PR from dev to master:
+   - Always use "Rebase and merge" option when merging to master
+   - This keeps the history clean and linear
+
+### Syncing Branches
+
+If GitHub shows that branches are out of sync or you can't use "Rebase and merge":
+
+1. Create a PR from master to dev on GitHub:
+   - Base branch: `dev`
+   - Compare branch: `master`
+   - Title: "Sync dev with master"
+
+2. If there are conflicts, resolve them locally:
+    ```bash
+    # Switch to dev branch
+    git checkout dev
+    
+    # Get latest changes
+    git fetch origin
+    
+    # Try to merge master (this will show conflicts)
+    git merge origin/master
+    
+    # Resolve conflicts in your editor
+    # Then commit the resolved changes
+    git add .
+    git commit -m "Resolve conflicts from master sync"
+    git push origin dev
+    ```
+
+3. Merge the PR on GitHub once conflicts are resolved
+
+This workflow:
+- Maintains PR history for all changes
+- Makes branch synchronization trackable
+- Provides clear context for conflict resolutions
+- Keeps main development in dev branch
+- Maintains clean history in master
+
 ## Pull Request Guidelines
 
 Before you submit a pull request, check that it meets these guidelines: