I am fed up with the way git works. I am not able to figure out how it works. I am using tortoisegit. I have pulled my instance and resolved the files which were conflicted.
Then git somehow locked and I had to solve that. Then I committed the resolved files.
Then I pushed these changes.
Now what happens is, the revisions that others committed is lost and it is showing only for me. All these files are now showing for me under "commit". What should I do now. Can i commit those files so that the changes that lost will be solved? how to know if there is any issues with my brach? Pls help me with this. I need solution very badly.
You surely read the Atlassian Tutorial for git? (I don't know how familiar you are with git, so I am maybe asking stupid questions)
It could be several problems.
The git book (http://git-scm.com/book) is another very useful resource. Sure, both focus on using commands, but besides that they explain "how it works", so you know what to expect when you "pull", "push", "merge", etc. These terms don't mean the same thing as they did for CVS/SVN.
Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs