This is the best explanation of when to merge vs. rebase that I've seen:
http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/
Added as comment to the wiki
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Tuesday, March 19, 2013 7:23 PM
To: [email protected]
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
This document is perfect, the maybe only little point it didn't cover in
"Keeping the feature branch up to date" is the possibility interactively
rebase your commit, which allows in case of too much conflicts, to abord it,
reset --hard and pull (fecth/merge).
Thanks for sharing,
-Fred
-----Message d'origine-----
From: Dasa Paddock
Sent: Tuesday, March 19, 2013 6:57 PM
To: <[email protected]>
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
This is the best explanation of when to merge vs. rebase that I've seen:
http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/
There's also now a public beta of SourceTree for Windows available:
http://blog.sourcetreeapp.com/2013/03/19/introducing-sourcetree-for-windows-a-free-desktop-client-for-git/
In regards to these unwanted merges, I've seen GitHub for Windows do this
automatically instead of giving an error when you click it's Sync button and
your local develop branch has commits that have not been pushed yet but the
remote also also has commits that are not yet on the local develop branch.
--Dasa
