Git and version control
git
= colaboration
svn
= version control
Makefile.feld - Git Is Not Revision Control
Feature Branch Workflow
- feature development should happen off
main
main
is official history
- push feature branches to central repo
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
# init
git checkout main
git fetch origin
git reset --hard origin/main
# branching
git checkout -b feature/superman main
# work
git status
git add .
git commit
# push to remote
git push -u origin feature/superman
# merge
git checkout main
git pull
git pull origin feature/superman
git push
|
Git Feature Branch Workflow | Atlassian Git Tutorial