How can I revert a single line?

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?

1 answer

1 accepted

This widget could not be displayed.

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

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Monday in Teamwork

The tools we make for teams? We use them every day at Atlassian to get shit done (and it works).

I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...

40 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you