Beruflich Dokumente
Kultur Dokumente
MY SUBREDDITS FRONT - ALL - RANDOM | ASKREDDIT - FUNNY - PICS - GIFS - TODAYILEARNED - VIDEOS - NEWS - GAMING - WORLDNEWS
MORE » -
search
This is an archived post. You won't be able to vote
or comment.
this post was submitted on 20 Jan 2015
pull? (self.git)
submitted 1 year ago by flitterio
username password
My local repo has the master branch
currently checked out. I accidentally did remember me reset password login
git pull origin otherbranch and Git
happily merged otherbranch into my
master , which I didn't intend. Now I have
lots of merge conflicts in many files due to
significant differences between the two
branches.
How can I undo this? I tried
git checkout master but it refuses,
saying that several files need merging.
12 comments share
all 12 comments
sorted by: best
[–] flitterio [S] 7 points 1 year ago
https://www.reddit.com/r/git/comments/2t0kx0/accidentally_pulled_a_remote_branch_into/ Page 1 of 4
Accidentally pulled a remote branch into different local branch — how to undo the pull? : git 17/09/16 15:02
https://www.reddit.com/r/git/comments/2t0kx0/accidentally_pulled_a_remote_branch_into/ Page 2 of 4
Accidentally pulled a remote branch into different local branch — how to undo the pull? : git 17/09/16 15:02
Run git reflog and check the list of commits. You'll probably see something like:
You can look a little further down the git reflog output and see the previous commit on the
master branch. The SHA1 that's listed there is the one you want to reset the HEAD of the
master branch to. That is, run
Git – Some bad situations and how I got myself out of them in plain english.
12 (ohshitgit.com)
submitted 4 days ago by arshubham
5 comments share
Ultra simple question that I can't find an answer for: How do I make remote be
9 an exact mirror image of local? (self.git)
submitted 1 day ago * by 1337_n00b
12 comments share
I have a static blog in a git repo at Gitlab. I would like to add a new post
https://www.reddit.com/r/git/comments/2t0kx0/accidentally_pulled_a_remote_branch_into/ Page 3 of 4
Accidentally pulled a remote branch into different local branch — how to undo the pull? : git 17/09/16 15:02
Any reason not to clone one repo inside another, to avoid submodule horror?
5 (self.git)
submitted 6 days ago by theonlybenji
10 comments share
Use of this site constitutes acceptance of our User Agreement and Privacy Policy (updated). © 2016 reddit inc. All rights reserved.
REDDIT and the ALIEN Logo are registered trademarks of reddit inc.
https://www.reddit.com/r/git/comments/2t0kx0/accidentally_pulled_a_remote_branch_into/ Page 4 of 4