Menu
I have 2 branches, which are not ready to be merged yet, but have some complementary logic, which I'd like to review (before merging)
Can I check out multiple git branches of the same project? Is it possible?
271
You can have many branches in your repository, but only one of these will be "checked out" as the working-tree so that you can work on it and make changes. git worktree adds the concept of additional working trees. This means you can have two (or more) branches checked-out at once.
So you can work on two branches simultaneously. One small catch is that you can't have the same branches checked out in different worktrees. So if you have checked out one branch in one worktree, then the same branch can't be checked out in another different worktree. Another catch is worktrees sync up with each other.
You can simply copy the repository to a new location (either by literally copying the directory, or using git clone --shared) and check out one branch per location.
You can also use git-worktree for creating multiple working directories from a single instance of a repository.
Otherwise, the primary means for comparing files between branches prior to merging them is git diff.
145
With Git 2.5+ (Q2 2015), a Git repo will support multiple working trees with git worktree add <path> (and that will replace contrib/workdir/git-new-workdir)
Those "linked" working trees are actually recorded in the main repo new $GIT_DIR/worktrees folder (so that work on any OS, including Windows).
See more at "Multiple working directories with Git?"
42
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
