git - Undo changes (commited and pushed) -

-

i have 2 commit's have commited , pushed. need return code state 'two commits ago'.

i can use git reset --hard <hash> locally, can not push changes:

hint: updates rejected because tip of current branch behind

how can return code previous commit in central repository?

update:

ms-app-actual/mobile-application » git reset --hard e50fa38c4865bd82fce7ddcf1e05d94012266364   ‹master› head @ e50fa38 move attachment class separate project   ms-app-actual/mobile-application » git push --force                                            ‹master› total 0 (delta 0), reused 0 (delta 0) remote: gitlab: don't have permission ssh://git@aaa.bb.cc.dd:2222/ms-mobile-app/mobile-application.git  ! [remote rejected] master -> master (pre-receive hook declined) error: failed push refs 'ssh://git@aaa.bb.cc.dd:2222/ms-mobile-app/mobile-application.git'

but can pull:

ms-app-actual/mobile-application » git pull                                                    ‹master› updating e50fa38..cebcabf fast-forward

and make ordinary commits.

i using gitlab.

doing git reset --hard , force pushing changes remove commits. however, need careful doing this. if else has pulled changes, cause problems history. , seems gitlab preventing doing anyway.

the best way create new commit undoes changes , push that. way pulls not have issues merging in changes. there couple of ways of doing this.

1) create 2 revert commits , rebase them one

git revert <sha of commit 1> git revert <sha of commit 2> git rebase -i <sha of commit in state> //squash 2 revert commits 1 git push

2) checkout changed files commit , commit changes

git diff --name-only head..head~3 | xargs git checkout head~3 --  //this should result in files modified in 2 commits being changed. git commit -am "reverting changes commits" git push

both of these solutions, result in same thing. new commit inverse of changes made in 2 don't want. safest way undo changes pushed remote repository.

as rule of thumb: once push changes remote repository, should consider them permanent.

since tried reset --hard, in order commits can undo them. need git pull.


Comments

Post a Comment

Popular posts from this blog

c# - SharpSsh Command Execution -

-
Image
i trying create ssh client using c#. using tamir.sharpssh library. having issues sending command , getting appropriate response server. the way have been testing sending on ls command, followed cd.. command, followed ls command again -- see whether or not cd.. command being executed properly. however, there no difference between first ls command , second ls command. not entirely sure doing wrong. perhaps using wrong ssh type. have provided code , output getting. have added output expect. using tamir.sharpssh; namespace sshnetexample { class program { static void main(string[] args) { sshexec ssh = null; try { console.write("-connecting..."); ssh = new sshexec(host, username, password); ssh.connect(); console.writeline("ok ({0}/{1})", ssh.cipher, ssh.mac); console.writeline("server version={0}, client versio
Read more

python - Specify path of savefig with pylab or matplotlib -

-
i struggling on how find correct way specify save path (or repository) when calling function savefig in matplotlib or pylab. i tried several syntaxes, everytime python console returns : filenotfounderror: [errno 2] no such file or directory: '../mydocs/resource/frames/myimage.png' currently, have written following : pylab.savefig('../mydocs/resource/frames/myimage.png') does know how it? thanks in advance! the tilde operator , variable $home entered strings , therefore not function while saving. have provide either relative path (as did) or provide full path. eg. pylab.savefig("/home/username/desktop/myfig.png") .
Read more

How to run C# code using mono without Xamarin in Android? -

-
i want create program uses mono runtime run c# code (binary not application). i copied libmono.so unity app , i'm write code using documentation: http://www.mono-project.com/docs/advanced/embedding/ and it's working have problems references can access classes mscorlib.dll , have problems system.reflection.assembly class throwing exception, when print console see: system.missingmethodexception: method not found: 'system.reflection.assembly.op_inequality' can fix it? can use mono runtime in c binary on android? ps. i'm using android tests. edit: found solution loading libraries, need set environment variable mono_path libraries path. but have still problems assembly class. the system.missingmethodexception error have seems .net profile mismatch error, 1 explained here . can use mono runtime in c binary on android? yes, using ndk guess. there alternatives can use instead of rolling own, such xmadevlab .
Read more