[git-users] Help! Unable to retrieve my stashed files!

2012-09-04 Thread kramer.newsreader
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

[git-users] Git/Gerrit/merging HELP!!!

2012-10-10 Thread kramer.newsreader
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

[git-users] Re: Git/Gerrit/merging HELP!!!

2012-10-10 Thread kramer.newsreader
@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

[git-users] Unable to pull from remote branch

2012-10-17 Thread kramer.newsreader
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

[git-users] Why do I have to be a source control engineer just to be a software developer?

2012-10-29 Thread kramer.newsreader
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

[git-users] Unable to push

2012-11-05 Thread kramer.newsreader
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')

Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader
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

Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader
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

Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader
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

[git-users] How to revert --amend

2012-11-08 Thread kramer.newsreader
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,