Hi all, I am trying to commit and push my project to the repo but I keep on getting this error, how should I resolve this. I want to save my projects
Rebasing will take all your changes off the branch, Puuls the code from upstream, and apply your changes one by one.
If there are any conflicts, you need to resolve them before pushing the code. Use Git Status to check.
I have encountered this error a few times lol.
What I usually do is say “No” to popup (it won’t get lost) and pause there in Studio. Normally if you do another pull over the abort it removes changes you have made because the sync breaks with this rebase/commit.
So I switch over to GIT Bash and do a Git Status to confirm if all changes are still being picked up. Then do a Git pull origin - this will do the pull correctly from your repo. Now if you have made changes, then do a Git Add . (yes the full stop included) - then a Git commit -m "{commit message}, then finally Git Push origin master.
Alternatively, abort the rebase and then restart Studio and try again. Just backup your project with your current changes before you do so.
It’s a glitch that gets caused when you rebase a project that already had other changes committed but not pushed. Usually from someone else who is also using the same repo.