This repository is designed for practice and learning purposes.
For first-time usage, we need to configure authentication for our Git account. To do this, we use the following commands:
git config --global user.name "Your Name"
git config --global user.email "[email protected]"
Note:
1. git clone
4. git status
5. git add .
6. git commit -m "name"
7. git push origin main
8. git pull origin main
1) 2 Different Files Changes | -> auto-merge | :q for quiting the warning window
if 2 or more persons working on the same repo. Person 1 pushed the code, and Person 2 is coding in his folder and wants to push the code, then a 'rejected' warning will be shown:
in this case, Person 2 should pull the code first and then push its own code.
2) Same File Changes | manual-merge:
if 2 or more persons working on a same repo in same file. Auto-Merge failed in this case, so maually accept the changes and after accepting, add, commit and push the code.
[Main-Branch]
|
[Dev-Branch OR Test-Branch]
| |
[Design-Branch] [Backend-Branch]
git checkout {branch name}