Welcome to OStack Knowledge Sharing Community for programmer and developer-Open, Learning and Share
Welcome To Ask or Share your Answers For Others

Categories

0 votes
1.4k views
in Technique[技术] by (71.8m points)

gitlab - 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.


与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
Welcome To Ask or Share your Answers For Others

1 Answer

0 votes
by (71.8m points)

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.


与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
Welcome to OStack Knowledge Sharing Community for programmer and developer-Open, Learning and Share
Click Here to Ask a Question

2.1m questions

2.1m answers

60 comments

57.0k users

...