akesson/Git_commands.md

## Git_commands.md

      
    Raw
  

              Git_commands.md
            
          
    Finding which the branch of a tag

Find the sha first:
git log -1 $TAG_NAME --format="%h"

Then check which branch(es) that has the commit:
git branch --contains $SHA

Resolving merge conflict by keeping the develop version

When merging on the feature-xxx branch use
git checkout --theirs VideoEditing/Components/CameraButton.swift

You can verify that there are no differences:
git diff develop --  VideoEditing/Components/CameraButton.swift

If you want to change back to feature-xxx version:
git checkout --ours VideoEditing/Components/CameraButton.swift

Updating local tags

git tag -l | xargs git tag -d
git fetch --tags