Github/Gitflow Tutorials - Githubissues

jonathan-freitas / ios-journey

This repo will keep al the things related to my learning of iOS Development.

MIT License

2 stars 0 forks source link

Github/Gitflow Tutorials #4

Open jonathan-freitas opened 6 years ago

jonathan-freitas commented 6 years ago

Official Guides from Github Team

Video Tutorials from Ray Wender Lich - Beginning Git

[x] 1 - Introduction
[x] 2 - Cloning a Repo
[x] 3 - Creating a Repo
[x] 4 - Creating a Remote
[x] 5 - Commiting Changes
[x] 6 - The Staging Area
[x] 7 - Ignoring Files
[x] 8 - Viewing History
[x] 9 - Branching
[x] 10 - Merging
[x] 11 - Syncing with a Remote
[x] 12 - Pull Requests
[x] 13 - Conclusion

Video Tutorials from Ray Wender Lich - Mastering Git

[x] 1 - Implementation of Git
[x] 2 - Merge Conflicts
[x] 3 - Stashes
[x] 4 - Aliases
[x] 5 - Rebase: A Mega Alternative
[x] 6 - Rebase: Rewriting History
[x] 7 - Gitignore After the Fact
[x] 8 - Cherry Picking
[x] 9 - Filter Branch
[x] 10 - Many Faces of Undo
[x] 11 - GUIs: GITK
[x] 12 - GUIs: Sourcetree
[x] 13 - GUIs: GitUp
[x] 14 - Conclusion

Atlassian Tutorial - Gitflow Workflow

screen shot 2018-11-09 at 15 14 12

The overall flow of Gitflow is:

A develop branch is created from master.
A release branch is created from develop.
Feature branches are created from develop.
When a feature is complete it is merged into the develop branch.
When the release branch is done it is merged into develop and master.
If an issue in master is detected a hotfix branch is created from master.
Once the hotfix is complete it is merged to both develop and master.

jonathan-freitas commented 6 years ago

GUIs done and commited today