I’ve asked before about how to squash the first two commits in a git repository. While the solutions are rather interesting and not really as mind-warping as some other things in git, they’re still a bit of the proverbial bag of hurt if you need to repeat the procedure many times along the development of … Read more
I am in the middle of rebasing after a git pull –rebase. I have a few files that have merge conflicts. How can I accept “their” changes or “my” changes for specific files? $ git status # Not currently on any branch. # You are currently rebasing. # (fix conflicts and then run “git rebase … Read more
I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions. Before running the “git commit –amend” (and after the git rebase –interactive) I decided that my changes were incorrect and so I executed “git reset HEAD –hard”. Not a good … Read more
Another question says that git pull is like a git fetch + git merge. But what is the difference between git pull and git fetch + git rebase? 2 Answers 2
I used git init to create a fresh repo, then made three commits. Now I want to rebase to go back and amend my first commit, but if I do git rebase -i HEAD~3 it complains! If I try the same with HEAD~2 then it kinda works but only lets me rearrange the last two … Read more
There’s ways to change the message from later commits: git commit –amend # for the most recent commit git rebase –interactive master~2 # but requires *parent* How can you change the commit message of the very first commit (which has no parent)? 5 Answers 5
Git’s documentation for the rebase command is quite brief: –preserve-merges Instead of ignoring merges, try to recreate them. This uses the –interactive machinery internally, but combining it with the –interactive option explicitly is generally not a good idea unless you know what you are doing (see BUGS below). So what actually happens when you use … Read more
I’m using git, and made a small commit followed by a large one. I decided to use git rebase to squash the two commits together before pushing them. (I’ve never done this before.) So I did: git rebase -i HEAD~2 This gave me my editor, where I chose to pick the earlier commit and squash … Read more
I have two (private) feature branches that I’m working on. a — b — c <– Master \ \ \ d — e <– Branch1 \ f — g <– Branch2 After working on these branches a little while I’ve discovered that I need the changes from Branch2 in Branch1. I’d like to rebase the … Read more
I have conflicting branches, feature_x branched from main. Let’s say when rebasing feature_x on current main, while resolving conflicts, I decide to take some (not all) of “their” (i.e. main) files as-is. How do I do that? I tried: git checkout main:foo/bar.java fatal: reference is not a tree: TS-modules-tmp:foo/bar.java git checkout refs/heads/main:foo/bar.java fatal: reference is … Read more
