Git

Question 1

Merge conflicts

Answer 1

Unable to resolve differences when merging in GIT. Developer has to manually fix it

“What code should be implemented?”

HEAD (main branch)
======= (division)
feature branch (new code)

Question 2

Git lifecycle

Answer 2

Untracked (local saves) → Staging (add) → Committed → Pushed

Untracked (local saves) → Staging (add) → Modified → Staging (add) → Committed →Pushed

Untracked (local saves) → Staging (add) → Unstaged (reset)

Question 3

Repository

Answer 3

Central location for projects history using version control. Hosted locally or on platforms

Question 4

GitHub actions

Answer 4

Developers can automate tasks thats triggered by specific events. CI/CD