Using Resolve Conflicts using THEIRS/MINE when you want to keep only one version and not merge them (for example in iOS sometimes the easiest way to deal with project.pbxproj conflicts if there are a lot of conflicts is to take theirs and then add your files back in).
Show how to manually fix conflicts by double clicking on the conflicted file in Sourcetree dealing with <<< HEAD ==== >>>> INTEGRATION lines.
-Use gitflow to close and merge a branch
How to stash and apply stashes
How to use the Sourcetree diff to discard single lines if you for example notice you put in too many line breaks or want to undo one things you've done but not the entire file
How to discard one file
How to reset all changes
How to merge (best suggestion is merge integration into your branch, fix conflicts, then use gitflow to close the branch and merge it to integration/develop)
Do not demonstrate rebasing. Rebasing is more advanced and anyone that wants to rebase should be technical enough to figure out how to do it themselves in Sourcetree without it being in the video. If it is in the video Hatchlings will think they have to do it all the time and could end up losing work or damaging their git history.
Gitflow
Commiting
Reading and understanding branch history
Cherry pick and why you might want to do this
Using Resolve Conflicts using THEIRS/MINE when you want to keep only one version and not merge them (for example in iOS sometimes the easiest way to deal with project.pbxproj conflicts if there are a lot of conflicts is to take theirs and then add your files back in).
Show how to manually fix conflicts by double clicking on the conflicted file in Sourcetree dealing with <<< HEAD ==== >>>> INTEGRATION lines. -Use gitflow to close and merge a branch
How to stash and apply stashes
How to use the Sourcetree diff to discard single lines if you for example notice you put in too many line breaks or want to undo one things you've done but not the entire file
How to discard one file
How to reset all changes
How to merge (best suggestion is merge integration into your branch, fix conflicts, then use gitflow to close the branch and merge it to integration/develop)
Do not demonstrate rebasing. Rebasing is more advanced and anyone that wants to rebase should be technical enough to figure out how to do it themselves in Sourcetree without it being in the video. If it is in the video Hatchlings will think they have to do it all the time and could end up losing work or damaging their git history.
Add link to onboarding and to tools page