merge - How to update my local repo using git pull without pushing -

-

i have local branch haven't done changes. do

git checkout anotherbranch # switched branch 'anotherbranch' # branch behind 'origin/anotherbranch' 25 commits, , can fast-forwarded. # (use "git pull" update local branch)

so apparantly need pull latest changes. this

git pull origin anotherbranch

i expect in sync, isn't because

git status on branch anotherbranch branch ahead of 'origin/anotherbranch' 2 commits. (use "git push" publish local commits)  nothing commit, working directory clean

is because merge part of git pull added 2 commits? these commits not show when git log. instead on top 2 commits made author. feels wrong me push 2 commits. don't want push @ update local branch. how can this? in case git pull mistake how can revert without producing alternative realities or other git horrors (i haven't pushed anything, except on feature branch)

git status on branch anotherbranch branch ahead of 'origin/anotherbranch' 2 commits. (use "git push" publish local commits)

it means have 2 commits not pushed.

as best practice run 

git fetch

once in while server metadata (updated deleted branches, new commits etc)

what results of command:

git log --oneline

it show log commits yu can see problem


Comments

Post a Comment

Popular posts from this blog

ios - UICollectionView Self Sizing Cells with Auto Layout -

-
Image
i'm trying self sizing uicollectionviewcells working auto layout, can't seem cells size content. i'm having trouble understanding how cell's size updated contents of what's inside cell's contentview. here's setup i've tried: custom uicollectionviewcell uitextview in contentview. scrolling uitextview disabled. the contentview's horizontal constraint is: "h:|[_textview(320)]", i.e. uitextview pinned left of cell explicit width of 320. the contentview's vertical constraint is: "v:|-0-[_textview]", i.e. uitextview pinned top of cell. the uitextview has height constraint set constant uitextview reports fit text. here's looks cell background set red, , uitextview background set blue: i put project i've been playing on github here . updated ios 9 after seeing github solution break under ios 9 got time investigate issue fully. have updated repo include several examples of different configurations s
Read more

node.js - ldapjs - write after end error -

-
i have created authentication service using following code in node.js , ldapjs. var when = require ('when'); var authenticationerror = require('../errors/authenticationerror'); var sessionmanagerservice = require('./sessionmanagerservice'); var ldap = require('ldapjs'); var client = ldap.createclient({ url: 'ldaps://ad.mycompany.com:636', tlsoptions: {'rejectunauthorized': false} }); module.exports = { signin: function (email, password) { return this.ldapbind(email, password).then( function () { return sessionmanagerservice.createsessionhash({email: email}); } ); }, ldapbind: function (email, password) { var deferred = when.defer(); client.bind(email, password, function(err) { if (err) { deferred.reject (new authenticationerror('invalid username and/or password!', 'authentication.signin.error')
Read more

DOM Manipulation in Wordpress (and elsewhere) using php -

-
DOM Manipulation in Wordpress (and elsewhere) using php - i'm quite new dom manipulation world , head start in order avoid mutual errors. i looking efficient way manipulate content generated wordpress using php. @ moment using simple html dom seems work fine. found domdocument , few others , helpfull if cleared out 1 faster, improve or @ to the lowest degree generate less errors in case of bad markup. also on side can explain syntax (instead of $html @$html) thank much php wordpress domdocument simple-html-dom
Read more