Handle GitHub Conflicts
Handle merge conflicts
Merge conflicts can occur during push or pull operations. Data Fusion provides resolution options based on the operation type.
Push conflicts
If you encounter merge conflicts during a push operation, select from the following options:
- Use My Version: Overwrite the remote branch with your local changes.
- Resolve Conflicts Manually: Open a pull request in the GitHub web editor, resolve the conflicts, and merge the pull request to the configured branch.
Pull conflicts
If you encounter merge conflicts during a pull operation, select from the following options:
- Use Remote Version: Overwrite your local changes with the remote branch.
- Resolve Conflicts Manually: Open a pull request in the GitHub web editor, resolve the conflicts, merge the pull request to the configured branch, and return to Data Fusion to pull the latest changes.
Discard current changes
Discard Current Changes reverts all uncommitted modifications in your local working branch. Your branch resets to match the most recent committed state from the connected GitHub repository.
Use this option to undo local edits, configuration updates, or documentation changes before publishing or pulling updates.
To discard current changes:
- From the GitHub dropdown menu in Data Fusion, select Discard Current Changes.
Change the configured branch
To switch to a different GitHub branch:
- From the GitHub dropdown menu, select Reconfigure GitHub.
- Select an existing branch or create a new one.
If you have unpublished local changes, the system attempts to rebase them onto the latest commit of the new target branch. If merge conflicts occur during the rebase, choose to use the remote version or resolve the conflicts manually.
If you resolve merge conflicts manually during a branch reconfiguration, return to Data Fusion and pull the latest changes. This step differs from standard push and pull operations.