The Git Rebase feature gives developers more control over how they synchronize their local branch with the remote branch.
Previously, the IDE only supported Git Pull. When using pull, if the remote branch already had new commits, Git would create an extra merge commit during synchronization. Over time, this could make the commit history look cluttered and harder to follow.
With the new Git Rebase option, developers can choose to reapply their local commits on top of the updated remote branch. This keeps the commit history linear, clean, and easy to read, avoiding unnecessary merge commits.
-
Pull: Brings in remote changes but may add extra merge commits, leading to a more complex history.
-
Rebase: Reapplies your local changes on top of the latest remote changes, producing a straight and tidy history.
You can perform a Git Rebase from the PowerBuilder IDE, by right-clicking the workspace/solution in the System Tree and then selecting Git Rebase from the pop-up menu.
The Git Rebase menu is only available at the workspace/solution level.
In the dialog that displays, configure the following options:
-
Current Branch – the branch whose commits you want to move or rebase.
-
Target > Rebase onto – the branch you are aligning your work with, usually the latest version of master or main (e.g.,
origin/master).
