4,637 Followers, 3,161 Following, 532 Posts - See Instagram photos and videos from Honua Hawaiian Skincare (@honuaskincare)
The first thing to understand about git rebase is that it solves the same problem as git merge. Both of these commands are designed to integrate changes from one branch into another branchâthey just do it in very different ways. Consider what happens when you start working on a new feature in a dedicated branch, then another team member updates the master branch with new commits.
I have a code source that has 3 branches to it: I'm working on Branch 2 while another programmer is working on Branch 1. I have recently pushed my changes to my branch after having pulled any changes locally. Then I merged my branch with the master. I'm now trying to merge his branch with the master but get a HUGE list of conflicts. Mostly things I added and synced to the master are conflicting with lines he added in the same files.