Re:Distrusting git
by mhartl on Sunday October 02, 2011 @02:04PM
(#3063494)
Running
is a good practice. That way you can abort and roll back if there are any serious conflicts.
[ Parent
| on HN ]
Be careful with this though: if you have a merge ready to push, and you pull with rebase, your merge will be 'flattened' and all commits in it duplicated on your current branch. I've been bitten by this a couple of times.