#gitPanic - Merging and Rebasing
The last blog covered adding your changes to a remote branch, but what if other developers are working in the repo at the same time as you? How do you add changes from one branch to another?
Merging
Rebasing
Cherry-picking
Conflicts
Fetching
Pu...
abbeyperini.hashnode.dev8 min read