When doing a git rebase, I often have difficulty working out what is happening with the ‘local’ and ‘remote’ when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next. This is probably (definitely) because I still haven’t properly understood. When rebasing, who is ‘local’ and who is … Read more
In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) do a few commits (M, N, O) master A—B—C \ newfeature-123 M—N—O 2. Pull new changes from upstream master: $ git pull (master updated with ff-commits) master A—B—C—D—E—F \ newfeature-123 M—N—O 3. … Read more
Suppose you have a history containing the three commits A, B and C: A-B-C I would like to combine the two commits A and B to one commit AB: AB-C I tried git rebase -i A which opens up my editor with the following contents: pick e97a17b B pick asd314f C I change this to … Read more
I’d like to rebase to a specific commit, not to a HEAD of the other branch: A — B — C master \ \– D topic to A — B — C master \ \– D topic instead of A — B — C master \ \– D topic How can I achieve that? 11 … Read more
Take the following case: I have some work in a topic branch and now I’m ready to merge back to master: * eb3b733 3 [master] [origin/master] | * b62cae6 2 [topic] |/ * 38abeae 1 I perform the merge from master, resolve the conflicts and now I have: * 8101fe3 Merge branch ‘topic’ [master] |\ … Read more
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 can’t really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there’s an –ff option would seem to imply that there’s a … 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
I was working on a repository on my GitHub account and this is a problem I stumbled upon. Node.js project with a folder with a few npm packages installed The packages were in node_modules folder Added that folder to git repository and pushed the code to github (wasn’t thinking about the npm part at that … Read more
I’m new to git and I’m trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase. 4 s 4 Merge commits: retains all of the commits in your branch and interleaves them with commits on the base branch Merge Squash: retains the … Read more
