Skip to content

Latest commit

 

History

History
25 lines (18 loc) · 623 Bytes

File metadata and controls

25 lines (18 loc) · 623 Bytes

Git Tags -- master
all changes are here v1 version - v1 v2 version - v2 -- list all tags in repo $ git tag create a tag git tag git tag -l "v1*" -- list all tags that matches v1*

two kind of tags
1. Lightweight tags - git tag <tagname> creates a light weight tag
2. Annoted tag	- git tag -a <tagname>	-- message( why this tag, who created ), 

Git merge conflicts -- merge conflicts are happens very often in repository where chagnes are frequent -- Why this happens - two branches have changes same file same line are being merged -- How to resolve merge conflicts - GitHub Actions