Terrence MiaoTerrence Miao - 2015-10-11 15:22:18+1100 - Updated: 2015-10-11 15:22:18+1100
Image
Shared with: Public
+1'd by: James Gemmell, Alex Fraser, Nagakrishna Rao, Jeremy Visser, Matt Giuca, David Coles, Michael Poloni
David Coles - 2015-10-12 07:20:46+1100
There was a bit of a debate on 'the other social network' to whether this means you force push, pull before you push or my suggestion that you push to a /new/ branch. XD
Terrence Miao - 2015-10-12 07:58:24+1100 - Updated: 2015-10-12 07:59:03+1100
Always work your story on a git branch. No merge conflicts until merge.
Matt Giuca - 2015-10-12 14:14:34+1100
Yeah so you would have your local branch set to push to a branch of the same name on your own private upstream (eg. on GitHub) so there are no conflicts.