myfunproj

Merge lp:~abentley/myfunproj/conflicts into lp:myfunproj

  1. conflicts
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Needs review
Proposed branch: lp:~abentley/myfunproj/conflicts
Merge into: lp:myfunproj
Diff against target: 1 lines (+0/-0) (has conflicts)
0 files modified
Contents conflict in README
To merge this branch: bzr merge lp:~abentley/myfunproj/conflicts
Reviewer Review Type Date Requested Status
Juju Gui Bot continuous-integration Needs Fixing
Review via email: mp+185919@code.launchpad.net

Commit message

Introduce conflict.

Description of the change

Introduce conflict.

To post a comment you must log in.
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://example.org
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://162.213.35.31:8080/job/myfunproj-autoland/44/
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Juju Gui Bot (juju-gui-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://162.213.35.31:8080/job/myfunproj-autoland/45/
Executed test runs:

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

3. By Aaron Bentley

Introduce conflict.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'README' => 'README.THIS'

Subscribers

People subscribed via source and target branches

to all changes: