GIT

Tip of your current branch is behind its remote counterpart:

git-failed-to-push

Solución para agregar con conocimiento los cambios locales:

Remote rebase + no local commits: force git to overwrite files on pull:

git reset --hard origin/branch-name

Solución automatizada:

Remote rebase + local commits 2: checkout to a new temp branch, “hard pull” the original branch, cherry-pick from temp onto branch

Cherry-pick the commits from temp branch onto the local branch

Cherry-pick each commit individually

git cherry-pick <commit-sha1> && git cherry-pick <commit-sha2>