The easy way, with a recent-enough Git (this has been out for a long time now so you should have this): git rebase -i –root The other easy way, as twalberg noted in a comment that has since been deleted but is now expanded in https://stackoverflow.com/a/68279810/1256452’s answer, is to use git checkout –orphan to set … Read more
As of Git version 1.7.12, you may now use git rebase -i –root Documentation
Try closing any programs that have the folder open, such as editors, explorer windows, command prompts, and FTP programs. This always fixes the issue for me on Windows.
As with a normal git rebase, git with –preserve-merges first identifies a list of commits made in one part of the commit graph, and then replays those commits on top of another part. The differences with –preserve-merges concern which commits are selected for replay and how that replaying works for merge commits. To be more … Read more
Switch to Branch2 git checkout Branch2 Apply the current (Branch2) changes on top of the Branch1 changes, staying in Branch2: git rebase Branch1 Which would leave you with the desired result in Branch2: a — b — c <– Master \ d — e <– Branch1 \ d — e — f’ — g’ <– … Read more
You want to use: git checkout –ours foo/bar.java git add foo/bar.java If you rebase a branch feature_x against main (i.e. running git rebase main while on branch feature_x), during rebasing ours refers to main and theirs to feature_x. As pointed out in the git-rebase docs: Note that a rebase merge works by replaying each commit … Read more
WARNING: git filter-branch is no longer officially recommended If you are here to copy-paste code: This is an example which removes node_modules from history git filter-branch –tree-filter “rm -rf node_modules” –prune-empty HEAD git for-each-ref –format=”%(refname)” refs/original/ | xargs -n 1 git update-ref -d echo node_modules/ >> .gitignore git add .gitignore git commit -m ‘Removing node_modules … Read more
You get that message because you made changes in your local master and you didn’t push them to remote. You have several ways to “solve” it and it normally depends on how your workflow looks like: In a good workflow your remote copy of master should be the good one while your local copy of … Read more
Merge commits: retains all of the commits in your branch and interleaves them with commits on the base branch Merge Squash: retains the changes but omits the individual commits from history Rebase: This moves the entire feature branch to begin on the tip of the master branch, effectively incorporating all of the new commits in … Read more
Suppose originally there were 3 commits, A,B,C: Then developer Dan created commit D, and developer Ed created commit E: Obviously, this conflict should be resolved somehow. For this, there are 2 ways: MERGE: Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. … Read more