[jgit-dev] EGit/JGit can merge now!

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[jgit-dev] EGit/JGit can merge now!

From: Christian Halstrick <christian.halstrick@xxxxxxxxx>
Date: Tue, 31 Aug 2010 01:40:29 +0200
Delivered-to: jgit-dev@xxxxxxxxxxx
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type :content-transfer-encoding; b=byeAtpiAmJ9stQaLo3dHFzusDEw437qwYda0MyHk3BpKaYerUiMLjd9ADkLcrREarG 1HvqF7fRZVnqdSzeujoK9NIIPrSH8mHhyc1uwHTbpTyYc67wQRmSqJs6MF9xF7WupAhI ZEtSp7eEiOMbF0hRk1qQ+L26fyNhp0YFWYoF8=
List-archive: <https://dev.eclipse.org/mailman/private/jgit-dev>
List-help: <mailto:jgit-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/jgit-dev>, <mailto:jgit-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/jgit-dev>, <mailto:jgit-dev-request@eclipse.org?subject=unsubscribe>

Hi,

finally: the merge is in! EGit/JGit can do content merge now. Let's
eat our own dogfood now and find remaining bugs by using it. Just try
out the "Team->Merge" functionality.

Ciao
  Chris

Follow-Ups:
- Re: [jgit-dev] EGit/JGit can merge now!
  - From: Matthias Sohn
- Re: [jgit-dev] [egit-dev] EGit/JGit can merge now!
  - From: Shawn O. Pearce
- Re: [jgit-dev] EGit/JGit can merge now!
  - From: Chris Aniszczyk

Prev by Date: Re: [jgit-dev] Merge in 0.9?
Next by Date: Re: [jgit-dev] EGit/JGit can merge now!
Previous by thread: [jgit-dev] Merge in 0.9?
Next by thread: Re: [jgit-dev] EGit/JGit can merge now!
Index(es):
- Date
- Thread

Breadcrumbs