18. Version Control System
Tracking code
changes
Tracking who
made changes
through branches
GIT
Keep a history of
previous versions.
Coding collaboration
35. Commit Messages
2. Use present tense of task done,
e.g. "Fix bug" instead of "Fixed a bug"
1. Keep it brief, clear and concise (50 characters or less)
3. Include relevant issue or ticket numbers
Example: DEL-1123: Add validation to uploaded files
4. Avoid using profanity or offensive language in
commit messages.
36. What command is used to stage changes
for the next commit?
a. git commit
c. git push
b. git add
d. git pull
48. Use descriptive and meaningful names for branches, such as:
"feature/login-page", "fix/bug-123"
Use hyphens or slashes to separate words in branch names.
Use issue or ticket numbers in branch name for better tracking
and traceability.
Use prefixes like "feature/", "fix/", "hotfix/" to indicate the
purpose of the branch.
1.
2.
3.
4.
50. Pull Requests
A pull request is like politely asking your team to
check and add your work to the main project.
51. 1. Facilitates collaboration by allowing developers to
propose changes to a codebase.
2. Enables peer reviews ensuring proposed
changes meet quality standards before merging.
4. Integration with Continuous Integration (CI) systems
automated testing and validation processes.
3. Fosters communication among team members,
with features like comments and reviews.
53. 1. Integrates changes from one branch.
2. Combines changes from a feature or development
branch into the main or release branch.
4. Allows developers to incorporate new features, bug
fixes, or updates into the target branch.
3. Preserves the history of changes and ensures
collaboration among team members.
57. 1. Generally arise when two people have changed the same
lines in a file, or if one developer deleted a file while
another developer was modifying it.
2. Git cannot automatically determine what is correct.
4. It is then the developers' responsibility to resolve
the conflict.
3. Git will mark the file as being conflicted and halt the
merging process.