Git

Git and GitHub Commands for Collaborators

No direct command; done via the GitHub interface.

No direct command; performed in the Gitpod interface.

git clone [repository URL]

git checkout -b [new-branch-name]

git add [file-name]

or

git add .

git commit -m "[commit message]"

git push origin [branch-name]

No direct command; done via the GitHub interface.

Configuring a Remote for the Upstream Repository:

git remote add upstream https://github.com/[CREATOR-NAME]/[REPO-NAME].git

Fetching from the Upstream Repository:

git fetch upstream

Merging Changes into Your Local Main Branch:

git checkout main
git merge upstream/main

Pushing Changes to Your Local Fork on GitHub:

git push origin main

git checkout main
git pull origin main

git checkout [your-branch-name]
git pull origin main
git push origin [your-branch-name]

git checkout [branch-name]

git checkout main  # or git checkout master
git merge [branch-name]

Locally:

git branch -d [branch-name]

Remotely:

git push origin --delete [branch-name]

git branch  # local branches
git branch -a  # all branches

git log

git stash  # stash changes
git stash apply  # reapply stashed changes

Manual resolution in the affected files

git add [resolved-file]
git commit

git revert [commit-hash]

git status