How can I revert a single line?

[Stefan Eike]

Hi I fixed Java Property string resources with thousands of lines and changes. Now during PR review, reviewers say, revert this or that line. How can I efficiently revert the changes line by line?

[Tim Pettersen · Accepted solution]

Hi Stefan!

You could follow the advice in this SO answer. Basically:

# generate a reverse patch of your commit(s)
$ git revert --no-commit <commit-sha>... 
 
# soft reset to clear your index
$ git reset
 
# interactively stage the deletion of only the lines to be reverted
$ git add -p
 
# remove the rest of the reverse patch that you don't want to commit
$ git checkout .
 
# finally, commit the revert
$ git commit -m "Revert changes as per pull request"

Hope this helps!

cheers,

Tim

[Stefan Eike]

Hi Tim,

thanks for your answer. I hoped there would be a convenient Bitbucket way to do this, that would be as easy as adding an inline comment.

Greetings,
Stefan