Github user kinow commented on the issue:

    https://github.com/apache/commons-lang/pull/311
  
    I would run something like `git rebase -i HEAD~123` where 123 is the number 
of commits I'm going back. Then squash the commits into a single one, 
discarding commit messages. Finally, would use a single commit message like 
"LANG-1373: The description here...". And then `git fetch --all` followed by a 
`git rebase origin/master` to make sure it's at the most recent change in the 
remote repository as well. If no merge conflicts, you can simply `push -f` to 
your branch, and that should do it.
    
    In case you are concerned about losing your changes, just do from your 
branch a `git checkout -b backup-1373` or some other name, `git checkout -` to 
go back to your branch, and give it a try (or do it in the other branch, 
whichever you prefer)


---

Reply via email to