[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Custom printers for SRFI-9 records

From: Ludovic Courtès
Subject: Re: Custom printers for SRFI-9 records
Date: Thu, 27 May 2010 00:42:38 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)

BTW, you should always create a local branch when working on something,
even if it may eventually be committed to ‘master’.  The reason is that
something else may be pushed before your commit, and if you just run
‘git push’ after that, we’ll end up with a merge commit, which we’d
rather avoid.

So the workflow would be:

  $ git branch wip-foo
  $ git checkout wip-foo
  # hack...
  $ git commit ...

  # Check whether something was pushed.
  $ git checkout master
  $ git pull

  # if “already up-to-date”:
  $ git merge wip-foo && git push
  # else
  $ git checkout wip-foo
  $ git rebase master
  # and try again
  # endif

Also I recommend using Magit: <>
or <>.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]