See the picture below:
I am in a branch called
430-toggle-hide-show-colums (in green).
This is a local branch pushed to GitHub as P.R. draft (not yet merged).
Accidentally, I ended up doing development on the wrong branch
back-up-pode-te-salvar which was supposed to be a "back-up" branch before doing some interactive rebase changes.
I would like to bring the fast forward changes from
back-up-pode-te-salvar which has a few commits in the future (all other parts are equal) into the official green branch called
430-toggle-hide-show-column, I tried the following:
1 - I pressed
2 - After being asked:
Pull into 430-toggle-hide-show-columns from
3 - And then typed
It was necessary to type everything since auto-complete did not work as I was expecting.
Worse than that, the mini-buffer echoed:
There is no potential conflict.
Why is this happening?
How can I pull changes from one local branch to another in Magit?