[git-users] How to revert --amend
Hi, I made a commit and pushed it to a remote repo (gerrit). It turns out that my commit needs to be reverted and different changes need to be commited. According to our process, all changes for a given ticket should be pushed as an amended commit. That way gerrit can combine them. Anyway, it turns out that --amend is not an option for revert, so it creates a new commit. Any help would be appreciated. --
[git-users] Unable to push
Frustrated new git user here... Anyway, I have some changes that I would like to push but am unable I get the following error: error: failed to push some refs to 'ssh://git@...' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Okay, so if I am translating git's terminology back to human language, I believe that this is telling me that I cannot push because I would lose history. My change is not downstream of where the head is. The thing is that I just did a successful git pull -rebase, so my changes should be right on top of the head. I can confirm that by attempting another pull: JohnKramer-2:statistics jkramer$ git pull --rebase Current branch nov2012 is up to date. What's going on here? --
Re: [git-users] Unable to push
Yeah that's what I would figure, but it isn't the case. Git status shows no conflicts. I did a git pull(and did pull in a change or two that was made since my last post here). Git status still showed no conflicts, so I tried a push again, but got the same error. On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote: Is there conflicts in your repository? What is the result of a git status? If there is no conflicts, I think that someome pushed new commits and you need to do a git pull --rebase again. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader kramer.n...@gmail.comjavascript: wrote: Frustrated new git user here... Anyway, I have some changes that I would like to push but am unable I get the following error: error: failed to push some refs to 'ssh://git@...' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Okay, so if I am translating git's terminology back to human language, I believe that this is telling me that I cannot push because I would lose history. My change is not downstream of where the head is. The thing is that I just did a successful git pull -rebase, so my changes should be right on top of the head. I can confirm that by attempting another pull: JohnKramer-2:statistics jkramer$ git pull --rebase Current branch nov2012 is up to date. What's going on here? -- --
Re: [git-users] Unable to push
Here you go. I've anonymized checkin messages, domains, etc. By the way, I am *attempting* to work on the nov2012 branch both locally and remotely. $ git branch -avv master f645170 Fix over_18 parameter. See #19010 * nov20127fc7d04 [origin/nov2012] Little more javadoc ticket/15734 251a314 Adding support for ... ticket/17513 5251a79 Updated ... tmp_branch 3f4b7bd Fixed ... remotes/origin/HEAD- origin/master remotes/origin/master 9ecfb22 Support for ... remotes/origin/mojiva 71ef51a Fix ... remotes/origin/nov2012 7fc7d04 Little more javadoc remotes/origin/testa2b09e8 Recalculate ... remotes/origin/test-branch 443339d Fix ... $ git remote -vv gerritssh://user@gerrit.domain:29418/project (fetch) gerritssh://user@gerrit.domain:29418/project (push) originssh://git@git.domain/project (fetch) originssh://git@git.domain/project (push) On Monday, November 5, 2012 4:52:06 PM UTC-5, Alexandru Pătrănescu wrote: maybe you have multiple remotes and you pull from one and try to push to another. show us as possible an output from: *git branch -avv* and *git remote -vv* * * On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote: Yeah that's what I would figure, but it isn't the case. Git status shows no conflicts. I did a git pull(and did pull in a change or two that was made since my last post here). Git status still showed no conflicts, so I tried a push again, but got the same error. On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote: Is there conflicts in your repository? What is the result of a git status? If there is no conflicts, I think that someome pushed new commits and you need to do a git pull --rebase again. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader kramer.n...@gmail.com wrote: Frustrated new git user here... Anyway, I have some changes that I would like to push but am unable I get the following error: error: failed to push some refs to 'ssh://git@...' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Okay, so if I am translating git's terminology back to human language, I believe that this is telling me that I cannot push because I would lose history. My change is not downstream of where the head is. The thing is that I just did a successful git pull -rebase, so my changes should be right on top of the head. I can confirm that by attempting another pull: JohnKramer-2:statistics jkramer$ git pull --rebase Current branch nov2012 is up to date. What's going on here? -- --
Re: [git-users] Unable to push
Is your remote a 'bare' repository, or does it have a working directory? -- I ask because you say you are working on the branch on both sides. It is normal to have your remote as a 'bare' repo, though you can manage if both are 'working' but in such cases you would use different branches on the repos so that you won't loose data. I am not really sure I understand your question. I didn't set up this repository. I have to work on it. The person who did is mostly unavailable. Having said that I *think* it is bare but I'm not sure. Does the output that I pasted above bear on that fact? If not, is there more information I can give? Sorry, but git is very confusing to me. --
[git-users] Why do I have to be a source control engineer just to be a software developer?
I am a fairly experienced developer and I have never had issues working with source control tools before git. I take a new job. I am working with git. I am thinking about quitting over having to use it. Every source control tool I have used before has an easy command that says: Use these changes right here. Yes there are conflicts, but these are correct. How can I get to Not currently on any branch when I was on a branch and didn't ask to switch branches? Where is that with git? Why is the git information model SO COMPLICATED? Why can't there be a way to Why is the documentation so inadequate? Why do I have to be a source control engineer just to be a software developer? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/2e2Mu1N2tVYJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Unable to pull from remote branch
Hi guys, FYI Git n00b here. I am having trouble pulling from a remote branch. I'm not really sure what's going on. I didn't have any problem with this yesterday. I can manually log in to the remote server (gerrit). See the commands below: $ git branch -a master * nov2012 remotes/gerrit/master remotes/origin/HEAD - origin/master remotes/origin/master remotes/origin/nov2012 remotes/origin/test remotes/origin/test-branch $ git pull --rebase remotes/origin/nov2012 fatal: 'remotes/origin/nov2012' does not appear to be a git repository fatal: The remote end hung up unexpectedly Thanks much for the help guys!!! -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/EmcdHzCcrPAJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Git/Gerrit/merging HELP!!!
Hi guys, Total git n00b here. Thanks in advance for the help. I am really having trouble. I am working in a new system. We are using git as a versioning system and gerrit as a review system/remote repository. Anyway, I was working on the branch 'master' and switched to another branch call it 12345, did some work there, made some checkins, pushed them to gerrit, no problem. Then I tried to switch back to master and the problems started. I switched back by doing git checkout master. When I switched back, git told me that my branch was behind remote (or possibly ahead, I'm not sure and can't reproduce the message). I did a git pull to get back into sync and a commit to separate the work I'm doing from the changes the pull did. I made my changes and did a commit. Then I tried to push to gerrit. Gerrit refused to accept my push saying that I don't have permission to push a merge. I didn't mean to do a merge at all, so I decided to look at my changes using git log (see a sanitized version of the git log output below). From the output, it seems that the pull actually did a merge (commit dc613fdf1273fc5d002beccc3bc2c93f4ddc3f61). Did I make a mistake in doing the pull at that point? I didn't want to merge anything, I just wanted to sync my branch master to the remote master. I had no files in play. What should I have done? Am I missing something else here? * commit d97ceffd44a453b18bc25261c7572497d749b1c5 | Author: …. | Date: Wed Oct 10 13:56:15 2012 -0400 | |Added ability to… | | Change-Id: Ib784294ba37a2c300465e07b2aa8ed0fdb62470a | * commit dc613fdf1273fc5d002beccc3bc2c93f4ddc3f61 |\ Merge: 3eca78c 7d7c37b | | Author: ... | | Date: Tue Sep 18 14:57:09 2012 -0400 | | | | Merge branch 'master' of ssh://git.mydomain.com/backend | | | * commit 7d7c37b1cff1acee33405ba5d67cc3d7fc8457cf | | Author: ... | | Date: Tue Sep 18 14:10:04 2012 -0400 | | | | Added support for... | | | | Change-Id: I4cb41b61c7712f5b349dd701a3d059fd30e93c9e | | Reviewed-on: http://gerrit.mydomain.com/377 | | Reviewed-by: ... | | Tested-by: ... | | | * commit eec1693384ca316001c6f1df7281ad69426f269c | | Author: ... | | Date: Thu Jun 14 16:12:58 2012 -0400 | | | | Fix... | | | | Change-Id: I330013524d7b8b2403cec5558ec328dcd95b6476 | | Reviewed-on: http://gerrit.mydomain.com/294 | | Reviewed-by: ... | | Tested-by: ... | | | | * | commit cd08f9e73c8f4691344f95092bd5a1df47b03922 |/ Author: ... | Date: Tue Aug 28 17:16:02 2012 -0400 | | Server ... | | Change-Id: I463ed9365b34185b7352d8ae65a36ac09e7e3bd2 | * commit 359879c07328e30202886900404c222c3a2f260c | Author: ... | Date: Mon Jul 16 11:23:06 2012 -0400 | | Fix ... | | Change-Id: I2d6a2cd443dc354f9fea06635858b051e94ede1f | Reviewed-on: http://gerrit.mydomain.com/326 | Reviewed-by: ... | Tested-by: ... | * commit 10662c44fc29fc878f29e6c0309fdf3ef08da182 | Author: ... | Date: Thu May 31 16:21:55 2012 +0700 | | Fix request ... | | Change-Id: I8e0b3628edd1264dbb43f7f2aa479170ff6f2275 | Reviewed-on: http://gerrit.mydomain.com/277 | Reviewed-by: ... | Tested-by: ... -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/O-SDAwQJX4EJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Git/Gerrit/merging HELP!!!
@Thomas Worked like a charm. Thanks so much. Git seems like a great tool, but the learning curve is a bit steep. I think I understood what happened and at least won't make that mistake again. Cheers! -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/cYh0LhSTH74J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Help! Unable to retrieve my stashed files!
First, let me preface this post by saying that yes I am new to git and that it has by far the steepest learning curve of any source control system I have used. My question is a two parter. 1) I am working in a slightly different environment than my colleagues and need changes to the source in order to build. Yes, there are probably ways to refactor our code to alleviate this problem at least somewhat, but I am the new guy and that's political (don't get me started). Anyway, I would like to set up some sort of SANE system such that whenever I fetch, I can apply my changes without adding them to the change list so as NOT to commit them. 2) I thought I could use git stash for this, so I did this: git stash --include-untracked and when I do git stash show it shows this: backend/infinispan-rar/pom.xml | 12 ++-- backend/pom.xml| 13 +++-- backend/test/pom.xml |3 +-- .../main/resources/com/mojiva/testDbContext.xml|6 +++--- data/mojiva.xml|2 +- dbmigration/pom.xml| 16 ++-- .../main/resources/db/changelogs/issue-17544.xml |4 ++-- pom.xml| 11 +++ but when I try to retrieve them, it doesn't work: backend/activator/effective.pom already exists, no checkout backend/adverter/src/test/java/com/mojiva/presenter/RequestParamReplacerTest.java already exists, no checkout backend/dao/.cpath already exists, no checkout backend/dao/.e0 already exists, no checkout backend/dao/PutObjectStoreDirHere/defaultStore/Recovery/TransactionStatusManager/#22#/0_c0a86465_cfd2_5016b5cb_1 already exists, no checkout backend/dao/dep.tree already exists, no checkout backend/feeds-test/.e0 already exists, no checkout backend/feeds-test/dep.tree already exists, no checkout data/wurfl-patch.xml already exists, no checkout run/linksDB.log already exists, no checkout run/linksDB.properties already exists, no checkout run/linksDB.script already exists, no checkout Could not restore untracked files from stash I really need these files back and stash won't give them back! Any help would be appreciated. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/A6umBNBpw3sJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
