eclipse - git merge into master branch uncommitable -

eclipse - git merge into master branch uncommitable -

i still new git please forgive me if has been asked before, have not been able find solution. using git , gerrit , trying merge branch issue master branch however, when doesn't seem commit/push remote repository. note: seem merge locally without conflicts. trying merge latest pushed commits in each branch.

so, have done:

1) switch master branch. 2) in eclipse gui , using git bash shell ran git merge issue 3) git status > 2 commits above remote repo 4) git pull > no new changes 5) git commit > no new changes 6) git push > remote rejected, no new changes.

all changes commited , pushed in each branch, trying merge changes in issue master. when git merge git bash shell, seems hung @ to the lowest degree 15 min, should take 2 if gerrit heavily loaded @ time. no matter do, after merge branches, tells me above 2 commits, every command know of don't have change. included commands: pull, push, commit, rebase (--soft , --mixed), reset, etc. thing have found show difference if git log show commits merge, , git log master not have commits.

i have wiped local repository , re-created several times see if there messed up. each time issue. help appreciated.

edit 1: git status results:

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

git force bash shell:

$ git force *

note: on git force * not there has | blinking, seems hung up.

edit 3: same force still hung up, 1 hr later.

edit 2: git remote bash shell:

$ git remote -v show origin ssh://sparks@gerrit:port/project (fetch) origin ssh://sparks@gerrit:port/project (push)

neither eclipse nor git bash actively have activity git right other git push

the merge issue branch fast-forward merge, i.e. merge advances branch pointer of target branch (the 1 have checked out) , doesn't produce new commits.

unless add together additional options force gerrit refuses take changes pushed refs/for/branchname if commit sha-1 known, i.e. isn't new commit. in case contents of issue branch had been pushed gerrit before.

to forcefulness creation of merge commit pass --no-ff git merge. merge commit end reviewable alter in gerrit.

eclipse git merge gerrit