From: David H. <d...@hx...> - 2011-07-13 13:11:13
|
On Wed, 2011-07-13 at 14:43 +0200, Damien Regad wrote: > Before I go ahead, can someone please confirm, what is the correct and > proper way of fixing this situation > > a) revert both commits and apply the correct fix for both branches, or > b) make a new, corrective commit for each branch Oops... my bad. It's probably best to revert the commits and reapply a correct patch to both branches. This approach typically makes it easier to see that patches have been rolled back, thus reducing the number of commits that need to be reviewed. Before pushing to Github you can do: git log -p origin/master..master This will show the difference of commits between origin and your local branch that you're doing to push. Regards, David |