Identi.ca Identi.ca
  • Login

  • Public

    • Public
    • Groups
    • Featured
    • Popular

Conversation

Notices

  1. Magnus Magnus Mercurial DVCS

    how can I do git merge --strategy=ours (i.e. create a commit with no parents, but supersede one with the other) in !mercurial?

    Wednesday, 29-Jul-09 18:55:49 UTC from xmpp
    • Brendan Cully Brendan Cully

      @legoscia: http://mercurial.selenic.com/wiki/TipsAndTricks#mergemineortheir

      Wednesday, 29-Jul-09 19:04:43 UTC
      Magnus likes this.
    • Magnus Magnus Mercurial DVCS , Brendan Cully

      @brendan That worked fine. Thanks! !mercurial

      Wednesday, 29-Jul-09 19:37:51 UTC

Site notice

  • API
  • Status

Feeds

  • Activity Streams
  • RSS 2.0
  • Atom
  • Help
  • About
  • FAQ
  • TOS
  • Privacy
  • Source
  • Version
  • Contact

Identi.ca is a microblogging service brought to you by Status.net. It runs the StatusNet microblogging software, version 1.1.0-alpha1, available under the GNU Affero General Public License.

Creative Commons Attribution 3.0 All Identi.ca content and data are available under the Creative Commons Attribution 3.0 license.

Switch to mobile site layout.

Built in Montreal