# Uses branches in git

git branch                        # show branches
                                  # current branch is marked with a '*'
git branch -vv                    # verbose mode
                                  # show tracked branches
git branch -a                     # show all branches, including remote
                                  # branches

git fetch                         # fetch branches from, by default, origin

git switch <branch>               # switch to <branch>, making it current
                                  # if <branch> is remote, create a local
                                  # tracking branch of same name and switch
                                  # to it

git switch -c <new-branch>        # create <new-branch> as a local branch,
                                  # and make it the current branch

git diff <branch> <file>          # show differences between <file> in
                                  # current branch and <branch>

# Only necessary if you want to publish another branch.  I.e., share it
# with others.
git push -u <remote> <remote-branch>   # push current branch to <remote>
                                       # as <remote-branch>.
                                       # current branch tracks <remote-branch>
                                       # Subsequent pushes --
                                       # 'git push'

git merge <branch>                 # merge <branch> into current branch

# Only necessary if you want to delete a branch once you're finished with it.
# I.e., merged it in to main.
git push -d <remote> <branch>      # delete remote branch
git branch -d <branch              # delete local branch


######################################################################

# example usage

# create new branch for working on, say, part 1 of a project
git switch -c part1

# git edit, add, commit workflow

# see differences between part1 version of foo and main version of foo
# assume part1 is current branch
git diff main foo

# Partner asks you to share --
git push -u origin part1

# Partner then runs
git fetch
git switch part1

# more git edit, add, commit workflow

# update remote
git push

# time to merge committed changes in part1 into main
git switch main
git merge part1

# publish changes to main
git push

# optionally delete local branch
# if team is finshed with remote branch, optionally delete remote branch