Last updated Unknown

Status: Tags: Links: Coding MOC

Git

Guide

• Updating a local clone with new branch name

Commands

Keep credentials: git config --global credential.helper store Show credentials: cat ~/.git-credentials

git rebase {branch}

• Introduce changes from main to feature branch
• edit commit history using git rebase -i {branch}

Merge conflicts

• git merge {branch}
• git rebase {branch}

Revert

• git revert {commit hash}

Merging vs rebasing

• Merging pros
  • Easier, simpler to resolve
  • Extra commit
• Rebase pros
  • More control over history
  • Cleaner history

Groupwork

Backlinks

1

list from Git

References:

Created:: 2021-07-15 23:07