Meliae

Merge lp:~jameinel/meliae/bad_merge into lp:meliae/tarmac-test

  1. bad_merge
  2. Merge into tarmac-test
Proposed by John A Meinel
Status: Rejected
Rejected by: John A Meinel
Proposed branch: lp:~jameinel/meliae/bad_merge
Merge into: lp:meliae/tarmac-test
Diff against target: 13 lines (+4/-0) (has conflicts)
1 file modified
README.txt (+4/-0)
Text conflict in README.txt
To merge this branch: bzr merge lp:~jameinel/meliae/bad_merge
Reviewer Review Type Date Requested Status
Meliae Development Team Pending
Review via email: mp+73806@code.launchpad.net

Commit message

Sexy failures FTW?

Description of the change

This one conflicts at merge time.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

Attempt to merge into lp:meliae/tarmac-test failed due to conflicts:

text conflict in README.txt

Revision history for this message
John A Meinel (jameinel) wrote :

Attempt to merge into lp:meliae/tarmac-test failed due to conflicts:

text conflict in README.txt

Unmerged revisions

195. By John A Meinel

Failing merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.txt'
2--- README.txt 2011-09-02 12:48:13 +0000
3+++ README.txt 2011-09-02 13:14:35 +0000
4@@ -6,5 +6,9 @@
5 disk format, which can then be parsed into useful things like graph
6 representations.
7
8+<<<<<<< TREE
9 Simple silly README update.
10
11+=======
12+A different edit. Should conflict
13+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: