2 posts tagged with "git"

compare gitflow and github flow

Gitflow​

Gitflow is a branching model built around Git, defining a structured approach to managing branches for different purposes in larger projects. It consists of several key branches: master, develop, feature, release, and hotfix.

More information: Gitflow Workflow | Atlassian Git Tutorial

Pros​

• Structured branching model for managing larger projects.
• Well-defined release process with versioning.
• Clear separation of features, releases, and hotfixes.

Cons​

• Complexity, especially for smaller projects or teams.
• Potential for longer release cycles.
• Overhead in managing multiple branches.

GitHub Flow​

GitHub Flow, in contrast, is a simpler workflow emphasizing continuous delivery and frequent deployments. It revolves around a single main branch (main or production) and feature branches.

More information: GitHub flow - GitHub Docs

Pros​

• Simplicity in its approach, suitable for smaller, agile teams.
• Continuous deployment and quick iterations.
• Flexibility for rapid feature development.

Cons​

• Might struggle with managing larger release cycles or complex projects.
• Lack of a formal release process might cause confusion in some scenarios.
• Limited in handling more structured release management needs.

Comparative Analysis​

Suitability​

• Gitflow: Suited for larger projects with well-defined release cycles and structured development phases.
• GitHub Flow: Ideal for smaller teams requiring rapid iterations and continuous deployment without complex branching.

Ease of Use​

• Gitflow: More complex due to multiple long-lived branches.
• GitHub Flow: Simpler, with fewer branches and a straightforward process.

Adaptability​

• Gitflow: Less flexible due to its structured nature, but effective for projects following a more traditional release model.
• GitHub Flow: Highly adaptable for agile teams and projects requiring frequent releases.

Recommendations​

• For larger projects with clear release cycles and a need for structured development phases, consider adopting Gitflow.
• For smaller, agile teams focusing on rapid iterations and continuous deployment, GitHub Flow might be more suitable.

Demo​

Gitflow Workflow Demo​

Setting Up Gitflow​

Assuming you have Git installed, to initialize Gitflow in a repository:

1. Install Gitflow via command line:

brew install git-flow
# Using apt-get (Ubuntu)
sudo apt-get install git-flow
# Using Homebrew (Mac)

2. Initialize Gitflow in a Git repository:

git flow init

Using Gitflow​

1. Feature Development:

• Start a new feature:

  git flow feature start new-feature
  

• Develop your feature on this branch, committing changes as needed.

2. Feature Completion:

• Finish the feature branch:

  git flow feature finish new-feature
  

3. Release Process:

• Start a release:

  git flow release start 1.0.0
  

• Perform release-specific tasks, bug fixes, version updates.

• Finish the release:

  git flow release finish 1.0.0
  

4. Hotfixes:

• Start a hotfix:

  git flow hotfix start issue-123-fix
  

• Make necessary changes and finish the hotfix:

  git flow hotfix finish issue-123-fix
  

GitHub Flow Demo​

GitHub Flow is simpler and follows a more straightforward branching model:

1. Main Branch (Production):

• All work is directly committed to the main branch.

2. Feature Development:

• Create a feature branch:

  git checkout -b feature-branch main
  

• Develop the feature on this branch, committing changes.

3. Pull Request:

• Once feature development is complete, open a pull request (PR) on GitHub.
• Review and discuss changes with colleagues in the PR.
• Merge the feature branch into the main branch upon approval.

4. Continuous Deployment:

• Changes merged into the main branch trigger automated deployments or continuous integration/continuous deployment (CI/CD) processes.

Summary​

Both Gitflow and GitHub Flow offer distinct advantages depending on the project's size, complexity, and release needs. The choice between the two workflows should align with the team's working style, project requirements, and desired release management strategy.

Git Basics​

git init
git clone <repository_url>
git status

Staging and Commits​

git add <file(s)>
git commit -m "Commit message"
git reset --soft HEAD^  // Undo Last Commit (Keep Changes)
git reset --hard HEAD^  // Undo Last Commit (Discard Changes)

Branching​

git branch <branch_name>
git checkout <branch_name>
git checkout -b <branch_name>
git merge <branch_name>
git branch -d <branch_name>

Remote Repositories​

git remote add <remote_name> <repository_url>
git push <remote_name> <branch_name>
git pull <remote_name> <branch_name>

Logging and History​

git log
git show <commit_hash>
git diff

Miscellaneous​

touch .gitignore  // Ignore Files (Create .gitignore)
git checkout -- <file(s)>  // Undo Changes in Working Directory
git reset HEAD <file(s)>  // Undo Staged Changes

Cherry-pick​

git cherry-pick <commit_hash>

Rebase​

git rebase <base_branch>
git rebase -i <base_branch>  // Interactive rebase

Squash Commits during Rebase​

// Change "pick" to "squash" for the commits you want to squash
// Follow on-screen instructions to edit the commit messages
git rebase -i <base_branch>

Amend the Last Commit​

git commit --amend

Stash Changes​

git stash
git stash save "Stash message"

Apply Stashed Changes​

git stash apply
git stash pop  // Apply and remove from stash

View Stash List​

git stash list

Show Differences with Stash​

git stash show -p <stash_id>

Discard Stashed Changes​

git stash drop <stash_id>
git stash clear  // Remove all stashes

Tagging​

git tag <tag_name>  // Create lightweight tag
git tag -a <tag_name> -m "Tag message"  // Create annotated tag
git push origin <tag_name>  // Push tag to remote

Submodules​

git submodule add <repository_url> <path>  // Add submodule
git submodule update --init --recursive  // Initialize submodules
git submodule foreach git pull origin master  // Update submodules

Git Configurations​

git config --global user.name "Your Name"
git config --global user.email "your@email.com"

Show Configurations​

git config --list