These are the branches that are named origin/branch_name (as opposed to just branch_name). When you are pushing and pulling the code to/from remote repositories this is actually the mechanism through which that happens. For example when yougit pusha branch called 'building_groups', your branc...
your branch is updated to behave as though it were only branched from the current state of the base branch. This rebase means that all of your changes are compared to the latest state of the base branch, and not the original commit you originally branched from. Rebasing can make history ea...
An alternative option would be to manually reimplement the fix on therelease-v1.0branch, but that approach would require much rework and not scale well across multiple versions. However, Git does offer an automated solution to this problem in the form of itscherry-pickcommand. ...
Now if you were doing some rebasing or had applied some other patch with "git am" that failed, git would not allow you to apply another patch with "git am" until you completed what you were doing (which is what you want). However, you could apply changes with "git apply" ...
I just hope I was able to clearly communicate what I mean and why I feel its valuable. And also you may split your work in different commits that you are gonna change later on (rebasing them and fix them up). You may have a section already part of the specification to split the diff...