On Wed, May 11, 2011 at 10:22 AM, Anders Gidenstam wrote:
> Each rebase moves your local commits to be on-top of all upstream commits.
>
> This is the effect of the rebase. If I had merged my branch with the
> upstream branch instead of rebasing it on top of the upstream branch my
> commits would
Anders, you're my hero! It actually worked :-)
Maybe I should add that to the wiki?
* Thorsten
> to keep your commit. Even if you merged your changed branch (e.g.
> with git pull) rather than rebasing it you'd get the conflicts.
>
> git status to check which files are in conflict.
On Wed, 11 May 2011, Curtis Olson wrote:
> Let me ask a dumb question then. I do a similar procedure to Thorsten,
> except in my local branch I do a "git merge master" instead of a rebase.
> Can someone explain the nuances of merge verses rebase?
Each rebase moves your local commits to be on-top
On Wed, May 11, 2011 at 2:27 AM, Thorsten wrote:
> > I then switch to master, do a
> >
> > git pull
> > git checkout local-weather
> > git rebase master
> >
> > Now the trouble starts...
>
Let me ask a dumb question then. I do a similar procedure to Thorsten,
except in my local branch I do a "gi
On Wed, 11 May 2011, thorsten.i.r...@jyu.fi wrote:
> I then switch to master, do a
>
> git pull
> git checkout local-weather
> git rebase master
>
> Now the trouble starts, because after the final command, the system
> bitches about merging conflicts and asks me to resolve them or use
>
> git reba
5 matches
Mail list logo
