How to avoid push?

Question

git

Began to download the new master, there was a conflict. The conflict has been resolved. Now it shows what to do Push

In text form, it looks like this:

On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean

I want to keep the last tightened master, but I don’t want to do a useless Push. Is there any way to avoid this push?

Answer 1

I want to keep the last tightened master, but I don’t want to do a useless Push. Is there any way to avoid this push?

You can do this push to another branch (just in case these changes are needed), then do a hard reset .

Answer 2

Try it....
This will remove your previous commit(s)

Answer 3

bg postion?
bg-attachment fixed?
before/after + pos-absolute + bg?

Answer 4

jsfiddle.net/f48ZD/156
is like one of the ways. But I would create two blocks under each of the columns, I would give the blocks through the background the
background that is under the column, align them as in the example above, through : before and : after I would set the top and bottom of the column position: absolute and z-index: 5;, would put a vlok div, the same with positioning, it's height: 100%; width: what you need; , and on the sideground: repeat-y; I would put the middle of the column, and the column would always be equal to the height of the content block

Answer 5

As I understand it, it is necessary that there are two columns on the left and on the right. In the center, as usual, all content.
Solution:

<div class="wrapper">
  <div classs="wrapper-left">
    <div class="wrapper-right">
      {контент}
    </div>
  </div>
</div>

The first wrapper is just to keep everything neat in one place.
wrapper-left { background for the left column }
wrapper-right { background for the right column }
Not very aesthetically pleasing, but it will work everywhere.