Useful Git Commands

Here are some Git commands that you might find useful. Use his command if you want to create a branch from your master-brach git branch [your_branch_name]   On conflict if you want to keep your file use "ours" or use "theirs" to keep the other version: git checkout --ours [file_name] git checkout --theirs [file_name] more