[Webkit-unassigned] [Bug 83702] resolve-ChangeLogs incorrectly duplicates entries landed via CQ

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=83702





--- Comment #4 from Adam Roben (:aroben) <aroben at webkit.org>  2012-06-20 06:21:47 PST ---
I don't think `git pull --rebase` is really what you want here. Your patch has been landed for you, so you want to throw away your local commit entirely. If you know that you don't have any other changes on your branch that you need to keep around, you could just do `git fetch && git reset --hard origin/master` or similar.

I guess another option would be to write a script that first does `git pull --rebase` then looks for these ChangeLog-only commits and removes them.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.