Version Control with Git
FCM vs Git
If you are familiar with FCM then this cheat sheet is for you! Adapted from Tomek Trzeciak’s (Met Office) comparison page.
fcm branch-create BRANCH_NAME (fcm bc)
git checkout -b BRANCH_NAME
This also switches you to the new branch.
git checkout -m -b BRANCH_NAME
Switches you to the new branch and also keeps local changes.
fcm branch-create –switch BRANCH_NAME (fcm bc –switch)
git checkout -b BRANCH_NAME main
fcm branch-list (fcm bls)
git branch
fcm checkout BRANCH_URL WORKING_COPY_PATH
git clone REPO_URL WORKING_COPY_PATH
cd WORKING_COPY_PATH
git checkout BRANCH_NAME
fcm switch BRANCH_NAME
git checkout BRANCH_NAME
or the newer command:
git switch BRANCH_NAME
fcm status
git status
fcm info
git status
fcm log
git log
fcm merge BRANCH_NAME
git pull REPO BRANCH_NAME
or:
git fetch REPO
git merge REPO/BRANCH_NAME
fcm conflicts
git mergetool
fcm resolve –accept=working FILE
git add FILE
fcm revert FILE
git checkout -- FILE
or the newer command:
git restore FILE
fcm commit
git add FILE
git commit
git push
fcm update
git pull REPO BRANCH_NAME
If BRANCH_NAME
is not specified the default branch will be pulled.
fcm branch-delete BRANCH_NAME (fcm brm BRANCH_NAME)
git branch -d BRANCH_NAME