Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by David Brown (93c59bc2e3dd6a7d09c36f87c820c731ed3a7112)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: SM-Commit <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by David Brown (93c59bc2e3dd6a7d09c36f87c820c731ed3a7112)
  • Date: Thu, 19 Oct 2006 21:26:37 +0200

On Thu, Oct 19, 2006 at 12:18:07PM -0700, David Brown wrote:
> On 10/19/06, Arwed von Merkatz <v.merkatz AT gmx.net> wrote:
> > On Thu, Oct 19, 2006 at 10:49:53AM -0700, David Brown wrote:
> > > On 10/19/06, Eric Sandall <eric AT sandall.us> wrote:
> > > > David Brown wrote:
> > > > > On 10/19/06, Eric Sandall <eric AT sandall.us> wrote:
> > > > >> David Brown wrote:
> > > > >>> GIT changes to master grimoire by David Brown
> > > > >>> <dmlb2000 AT gmail.com>:
> > > > >>>
> > > > >>> 0 files changed
> > > > >>>
> > > > >>> New commits:
> > > > >>> commit c8b6b6ad90d9a8b794775dbc69fb37edd04476e8
> > > > >>> Author: David Brown <dmlb2000 AT gmail.com>
> > > > >>> Commit: David Brown <dmlb2000 AT gmail.com>
> > > > >>>
> > > > >>> cogito updated 0.18.1
> > > > >> I already did this in commit
> > > > >> 1f5d0f6ce763bf7109061219b1c48f86f76b0267.
> > > > >
> > > > > yes you did and you got your commit in before mine, I merged what
> > > > > you
> > > > > did with what I did fixed the HISTORY file and pushed up. Not sure
> > > > > if
> > > > > I should have reverted my change first or what but I already pulled
> > > > > everything in and was in a conflicted state.
> > > >
> > > > Should revert, and then apply your changes. As it is, your HISTORY fix
> > > > didn't make it in.
> > >
> > > no the history entry was given to you since you pushed your changes
> > > first, I resolved it that way, we both did the exact same changes to
> > > the files, only our names were different in the history file... I
> > > know reverting does put a entry somewhere so reverting then pushing
> > > may also have made an email similar to this, only it would be,
> > > commited change that didn't affect any files, then reverted the change
> > > with no files, this might be an issue with git not sure.
> >
> > Can't you tell git to skip a conflicting commit when doing git pull?
> > I always use rebase when I have local changes, there you can just tell
> > it to skip that one change and continue.
>
> that command looks like it would be for branches only... does it work
> with commits?

You always commit to a branch (master), so yes, it works. pull and
rebase really do roughly the same thing, except in a different
direction.
- pull applies all changes done by others on top of your current branch
- rebase applies all changes you did since the last pull/rebase on top
of the current origin

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page