Git Flow: Rebase
I'm a passionate full-stack developer, constantly seeking to expand my knowledge and skills in the ever-evolving world of technology. With a love for learning and a thirst for exploring new technologies, I'm dedicated to honing my craft and pushing boundaries to create innovative solutions.
Rebasing is the process of moving or combining a sequence of commits into a new base commit. Rebasing is most useful and easily visualized in the context of a feature branching workflow.
From a content perspective, rebasing is changing the base of your branch from one commit to another, making it appear as if you'd created your branch from a different commit. Internally, Git accomplishes this by creating new commits and applying them to the specified base. It's very important to understand that even though the branch looks the same, it's composed of entirely new commits.
Rebase command
git pull –rebase origin/<branch name> (parent branch like dev branch)
After the conflict and fixing it run
git add <some files>
git rebase –continue
git pull
git push
Or
git rebase —abort
