Prerequisites
- A workspace with a connected git repository.
- A branch with committed changes that conflict with the target branch.
- Either Git Lite or Git Advanced enabled (this workflow supports both).
Steps
1
Open a pull request
Click the Git icon in the right panel to open the Git interface, then commit and push your changes. If your branch conflicts with the target branch, Paradime surfaces the conflict for you to resolve.
2
Resolve the conflicts
Paradime offers several options to resolve each conflict:
- Abort Merge: cancel the entire merge if the conflicts are too significant to resolve now.
- Accept Current Changes: keep the changes made in your branch.
- Accept Incoming Changes: apply the incoming changes from the target branch.
- Accept Both Changes: combine your changes and the incoming changes from the target branch.
- Compare Changes: visually compare your branch’s changes against the incoming changes.
3
Commit and resolve
Once you have decided how to resolve each conflict, click the Git icon in the right panel, click Commit and Resolve, then click Open Pull Request to continue with your pull request.
You will know it worked when the conflict markers disappear, the file shows your intended result, and the pull request opens in your git provider. If conflict markers remain, an unresolved hunk is still present, so resolve it and run Commit and Resolve again.
Next steps
Use Git Lite
Create branches, commit, and open pull requests the simple way.
Use Git Advanced
Take full control of staging and branch management.
Delete branches
Prune merged branches once your pull request is merged.
Version control reference
Every Git feature in the Code IDE.