I am working on a branch and it is not updated to the current one, I show how the structure is.
main
|
| \
| usuarioUno
| /
| \
| mi_rama
| /
|
|main
He usuarioUno
updated code and mi_rama
I can't update it. Although I already did a pull, but I can't get the code to update.
I appreciate the help in advance.
There are many ways to solve this problem but in my case I would do a rebase of my_branch with main and then my_branch will have all the changes from main and your code should work with something like the following
At the end of this process you should be able to see something like this in your branch log
Note: there is a chance that this will cause conflicts but you can fix them manually
References that you can consult: