anchor.diff:  		{{outlet}}
   	</script>
   	<script type="text/x-handlebars" data-template-name="pullrequest/index">
  -		{{#if model}}
  +		{{#if error}}
   		<div class="row">
  -			<div class="small-8 small-centered columns text-center">
  -				<ul class="button-group">
  -					<li><a title="Pick all" {{action 'pickAll'}} class="button tiny">Pick all</a></li>
  -					<li><a title="Fixup all" {{action 'fixupAll'}} class="button tiny">Fixup all</a></li>
  -				</ul>
  -			</div>
  +			<div class="small-12 column alert-box alert">
  +				{{error.message}}
  +			</div>
  +			<p>Manual rebase required</p>
   		</div>
  -		{{/if}}
  -		<div class="row">
  -			<div class="small-12 column">
  -				<ol class="commits">
  -				{{#each commit in model}}
  -					<li class="commit row">
  -						{{single-commit commit=commit moveup="moveup"}}
  -					</li>
  -				{{else}}
  -					<li>All commits on branch are upstream. Nothing to do!</li>
  -				{{/each}}
  -				</ol>
  -			</div>
  -		</div>
  -		{{#if model}}
  -		<div class="row">
  -			<div class="small-8 small-centered columns text-center">
  -				<ul class="button-group">
  -					<li><a title="Push changes upstream" {{action 'push'}} class="button tiny alert">Push</a></li>
  -					<li><a title="Perform rebase" {{action 'rebase'}} class="button tiny">Rebase</a></li>
  -				</ul>
  -			</div>
  -		</div>
  +		{{else}}
  +			{{#if model}}
  +			<div class="row">
  +				<div class="small-8 small-centered columns text-center">
  +					<ul class="button-group">
  +						<li><a title="Pick all" {{action 'pickAll'}} class="button tiny">Pick all</a></li>
  +						<li><a title="Fixup all" {{action 'fixupAll'}} class="button tiny">Fixup all</a></li>
  +					</ul>
  +				</div>
  +			</div>
  +			{{/if}}
  +			<div class="row">
  +				<div class="small-12 column">
  +					<ol class="commits">
  +					{{#each commit in model}}
  +						<li class="commit row">
  +							{{single-commit commit=commit moveup="moveup"}}
  +						</li>
  +					{{else}}
  +						<li>All commits on branch are upstream. Nothing to do!</li>
  +					{{/each}}
  +					</ol>
  +				</div>
  +			</div>
  +			{{#if model}}
  +			<div class="row">
  +				<div class="small-8 small-centered columns text-center">
  +					<ul class="button-group">
  +						<li><a title="Push changes upstream" {{action 'push'}} class="button tiny alert">Push</a></li>
  +						<li><a title="Perform rebase" {{action 'rebase'}} class="button tiny">Rebase</a></li>
  +					</ul>
  +				</div>
  +			</div>
  +			{{/if}}
  +
   		{{/if}}
   	</script>
   
  
positive.code: 			},
  			rebase: function() {
  				var self = this;
  				var resource = this.get('resource')
  				postRebase(resource, this.get('model')).then(function() {
  					getStatus(resource).then(function(model) {
  						self.set('model', model);
  					}, function(error) {
  						console.log(error);
  					});
  				});
  			},
  			push: function() {
  				var self = this;
  				var resource = this.get('resource')
  				postPush(resource).then(function() {
  					getStatus(resource).then(function(model) {
  						self.set('model', model);
  					}, function(error) {
  						console.log(error);
  					});
  				});
  			},
  
negative.code: 		return $.ajax({
  			url: url,
  			type: 'post',
  			timeout: 5000,
  			dataType: 'json',
  			contentType: 'application/json',
  			data: JSON.stringify(model, removeClientState)
  		});
  