DEV Community

Daamii-ui
Daamii-ui

Posted on

D2 0F THE 20 DAYS OF DJANGO.

I did my research and I learnt about forking, collaboration, pull request, merge conflicts, code review, GitHub issues, git commands and pushing changes to GitHub.

  1. Forking Forking creates a personal copy of someone else's repository on your GitHub account.

Useful for proposing changes to someone else's project without affecting the original.

Common in open-source contributions.

  1. Collaboration Involves multiple people working on the same project.

Can be done via shared repositories or through forks and pull requests.

Effective collaboration requires communication, clear code structure, and proper version control.

  1. Pull Requests A way to propose changes from one branch or fork to another.

Used to review, discuss, and merge code into a main branch.

GitHub shows differences and lets others comment or suggest changes.

  1. Merge Conflicts Occur when two branches have competing changes to the same part of a file.

Git can’t automatically decide which change to keep.

Must be resolved manually before merging.

  1. Code Review The process of examining code submitted in a pull request.

Helps catch bugs, improve code quality, and share knowledge.

Reviewers can approve, request changes, or comment on the code.

  1. GitHub Issues A tool for tracking tasks, bugs, feature requests, and discussions.

Can be assigned, labeled, and linked to pull requests.

Helps manage the workflow and organize project development.

  1. Git Commands Basic commands include:

git init – Initialize a new Git repository.

git clone – Copy a repository from GitHub.

git add – Stage changes for commit.

git commit – Save changes to the local repository.

git status – Check the state of your files.

git push – Upload commits to GitHub.

git pull – Download changes from GitHub.

git merge – Combine changes from different branches.

  1. Pushing Changes to GitHub After committing changes locally, use git push to send them to GitHub.

Syntax: git push origin branch-name

Keeps your online repository updated with local changes.

Let me know if you’d like visual diagrams or examples for any of these!

By messaging ChatGPT, you agree to our Terms and have read our Privacy Policy.
Don't share sensitive info. Chats may be reviewed and used to train our models. Learn more

Top comments (0)