Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Welcome To Ask or Share your Answers For Others

Categories

0 votes
1.5k views
in Technique[技术] by (71.8m points)

intellij idea - I am in Git/BitBucket Hell

I am a novice Git/BitBucket user and I have a big problem. I made some coding changes and did an initial commit/ push back to the repository from my local branch to the remote branch. Since that time have made many changes but only committed and pushed from local to remote but never merged with master. Stash will only provide the last committed changes which doesn't include the initial commit. Before I had a chance to fix the issue, my laptop crashed and I lost all of my local changes that I needed to merge.

I see that I can download the initial commit to a zip file. I should be able to take all the changes from the other remote commits and apply them in order to get back to a workable master copy(tedious but necessary). However, I am unsure how I would go about "checking out" the zipped intial commit so that I have a baseline to work on and eventually merge to the master. I am using Intellij 20.20.2 as the IDE.

If there is a better option please let me know.

question from:https://stackoverflow.com/questions/65854628/i-am-in-git-bitbucket-hell

与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
Welcome To Ask or Share your Answers For Others

1 Reply

0 votes
by (71.8m points)
Waitting for answers

与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
OGeek|极客中国-欢迎来到极客的世界,一个免费开放的程序员编程交流平台!开放,进步,分享!让技术改变生活,让极客改变未来! Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Click Here to Ask a Question

...