Manage your workflow with branches
- Paw for Teams
- Manage your workflow with branches
Create a new branch and push your changes
Create a new branch and push your changes
You can create a new branch by clicking the push button. Give a name to your branch and push changes there.
Switch between branches
Switch between branches
You can see all the branches for the current project from the drop-down in the top bar. Click Refresh Branches to make sure you get the recently added ones and choose a branch to work on.
Create snapshots to give a name to your current state
Create snapshots to give a name to your current state
To create a snapshot click the push button and choose the Create a Snapshot tab. Give a name to your current state. It will allow you to easily find your changes later.
Merge branches
Merge branches
To merge your branch into another branch click the push button in the top bar. Then choose the branch to merge into from the drop-down menu and press Push.
Resolve merge conflicts
Resolve merge conflicts
When there is a conflict Paw will suggest different options to resolve it. You can choose the options per request or for all the changes in the top bar.
Merge options:
Theirs Only: will keep only the changes of your team members and discard yours (force pull)Theirs: will prioritize the changes of your team members but will keep your changes if there are no conflictsUnion: will attempt to combine all additions from all parties, this typically results in joining of strings and can discard the order in listsBoth: will only be available if there are no changes to the same item, standard git merge optionYours: will prioritize your changes but will keep the changes of your team members if there are no conflictsYours Only: will keep only your changes and discard the changes of your team members (force push)
