CODEWITHSUNDEEP
gitgitlabgit-mergegit-revert
Stefza
Stefza

Reputation: 277

Re-committing a commit that was reverted in git

Having a few issues committing my code changes from my working branch back into a branch it was revert out of. My code was put into the release branch early and had to be reverted for another release, how do I then merge these changes back into the release branch as git says there are no changes being made when I merge.

I am unable to revert the revert commit or cherry pick my commits from the release branch as Gitlab doesn't allow me to do so.

Upvotes: 1

Views: 467

Answers (1)

Stefza
Stefza

Reputation: 277

To fix this,

I had to create a branch from a tag that was before the revert and the commits and cherry pick from my working branch into this branch to put it ahead of the revert commits. This allowed me to push this branch back into my Dev branch to reapply my changes.

Upvotes: 3

Related Questions