Re: [nattable-dev] git rebase

[Edwin Park <esp@xxxxxxxxxx>]

Thanks Dirk, this is useful information too. Rebase essentially allows us to have a linear commit history like in svn, basically because svn does not treat workspaces as local branches. The author of the article correctly points out that you should never use rebase if you are sharing your local branch with anyone else. For minor changes it is likely you're not sharing your local branch so rebasing is probably ok, but the takeaway for me is that you should know what you are doing when you rebase. I agree that simply doing a git pull is the safer default option. The only disadvantage there is that the commit history may look a little more complicated, but once you get used to reading branches and merges in the commit history this isn't such a problem. So rebase is fine if you have local changes you've never shared with anyone and you think it's more sensible to simply treat your changes as being applied on top of the current state, but otherwise stick with pull. I'm glad we're having these discussions as it's making me understand distributed version control and git more.  :-)

Thanks,

Ed

On Wed, Jul 18, 2012 at 10:53 AM, Dirk Fauth <dirk.fauth@xxxxxxxxx> wrote:

Hi,

you have to be carefull with using git rebase because you are changing the history.

http://changelog.complete.org/archives/586-rebase-considered-harmful

So IMHO we should consider using git pull and only rebase in special cases.

Greez,
Dirk

On Wed, Jul 18, 2012 at 4:20 PM, Edwin Park <esp@xxxxxxxxxx> wrote:

Thanks Stephan,

I didn't know about this command. When I was using git-svn I was always doing git svn fetch + git svn rebase (because there is no git svn pull), but now that we are in git I have just been doing git pull. I do see now that git pull --rebase is often more appropriate for the way we work.

Thanks for the info!

Edwin

On Tue, Jul 17, 2012 at 4:13 PM, Stephan Wahlbrink <sw@xxxxxxxxxxxx> wrote:

Hi all,

you are all familiar with 'git rebase' when fetching/pulling changes from eclipse and "join" them with your local changes?

For motivation see e.g.
http://stackoverflow.com/questions/2472254/when-should-i-use-git-pull-rebase

For short instructions and demo see e.g.
http://gitready.com/advanced/2009/02/11/pull-with-rebase.html

(git pull --rebase = git fetch + git rebase)

Ciao,
Stephan
_______________________________________________
nattable-dev mailing list
nattable-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/nattable-dev

_______________________________________________
nattable-dev mailing list
nattable-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/nattable-dev

_______________________________________________
nattable-dev mailing list
nattable-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/nattable-dev