git - How do I push corrected commits to a remote repository? -


i realized had set user.name wrong, used this answer fix incorrect commits. locally, worked great. however, git tells me 

$ git status # on branch master # branch , 'origin/master' have diverged, # , have 15 , 15 different commits each, respectively. #   (use "git pull" merge remote branch yours) # nothing commit, working directory clean

so, need somehow send changes github repository, when push:

$ git push warning: gnome-keyring:: couldn't connect to: /run/user/mspencer/keyring-uscl41/pkcs11: no such file or directory username 'https://github.com': ibeliever password 'https://ibeliever@github.com':  https://github.com/ibeliever/weather-desktop.git  ! [rejected]        master -> master (non-fast-forward) error: failed push refs 'https://github.com/ibeliever/weather-desktop.git' hint: updates rejected because tip of current branch behind hint: remote counterpart. merge remote changes (e.g. 'git pull') hint: before pushing again. hint: see 'note fast-forwards' in 'git push --help' details.

i'm not quite sure how fix this. i've dealt remote changes before, , solved them pulling , merging, i'm not sure in case. need update github repository corrected names, how do that?

steven's answer correct dangerous. careful when use forced push.

first of all, git push -f force push local branches remote repository.

to push master branch, must specify it.

git push -f origin master

when doing want tell other people have access repository pull down changes before make additional commits. otherwise branches diverge in crazy ways don't want deal with.


Comments

Post a Comment

Popular posts from this blog

Why does Ruby on Rails generate add a blank line to the end of a file? -

running rails generate controller foo home results in: class foocontroller < application controller def home end end (there's nothing on line in actual file, blank line) is there purpose blank line? it's common use newline indicate end of line, last line. many editors (like vi, use) add in newline silently. consensus text files (especially in unix world) should end in newline, , there have been problems historically if wasn't present. why should text files end newline? the tool used count lines in file "wc" counts newlines in file, without trailing newline show 3 instead of 4. it improves readability of templates used in generator. consider: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/controller/templates/controller.rb to remove trailing newline, template have last line of: end<% end -%> instead of: end <% end -%> that seems less readable me. the discussion below refers
Read more

keyboard - Smiles and long press feature in Android -

i've created android keyboard. how add features inserting smilies, , using long keypresses display symbols? to create long-press behavior allows select several options pop-up menu, follow guide (specifically pop-up menu section): http://developer.android.com/guide/topics/ui/menus.html smileys (also known emoticons) combination of keys, understood programs , parsed same way. have do, when clicks smiley face on keyboard, simulate pressing of key combination matching emoticon. example, when clicks smiley, should simulate key presses ':' , ')' :). here's list of emoticons: http://en.wikipedia.org/wiki/list_of_emoticons
Read more

node.js - Bad Request - node js ajax post -

i'm using express 3.0 , node v0.11.0. have button submits form , i'm using ajax post data json object node server. client code is: $('#contact').submit(function(e) { console.log('submit called'); var formdata = json.stringify($('form').serializeobject()); console.log(formdata); $.ajax({ url: "http://localhost:3000/savedata/", type: "post", datatype: 'json', data: {objectdata: formdata}, contenttype: "application/json", complete: function() { console.log('process complete'); }, success: function(data) { console.log('process sucess'); }, error: function() { console.log('process error'); }, }); return false; }); then on server: var express = require('express'); var app = express(); app.set('views', __dirname + '/views'); app.set('view engine', 'jade'); app.use(express.bodyparser());
Read more