git working on two branches simultaneously

by

Git 2.5+ (Q2 2015) supports this feature!

If you have a git repo cool-app, cd to root (cd cool-app), run git worktree add ../cool-app-feature-A feature/A. This checks out the branch feature/A in it’s own new dedicated directory, cool-app-feature-A.

That replaces an older script contrib/workdir/git-new-workdir, with a more robust mechanism where those “linked” working trees are actually recorded in the main repo new $GIT_DIR/worktrees folder (so that work on any OS, including Windows).

Again, once you have cloned a repo (in a folder like /path/to/myrepo), you can add worktrees for different branches in different independent paths (/path/to/br1, /path/to/br2), while having those working trees linked to the main repo history (no need to use a --git-dir option anymore)

See more at “Multiple working directories with Git?“.

And once you have created a worktree, you can move or remove it (with Git 2.17+, Q2 2018).

More Related Contents:

  1. Git fetch remote branch
  2. How to find the nearest parent of a Git branch
  3. How to fetch all Git branches
  4. How can I delete all Git branches which have been merged?
  5. Trimming Git Commits/Squashing Git History
  6. What are the differences between git branch, fork, fetch, merge, rebase and clone?
  7. Git – how to force merge conflict and manual merge on selected file
  8. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  9. How do you stop tracking a remote branch in Git?
  10. Rebasing a branch including all its children
  11. Using Git, show all commits that are in one branch, but not the other(s)
  12. How to get the changes on a branch in Git
  13. View a file in a different Git branch without changing branches
  14. How to determine when a Git branch was created?
  15. How do I remove local (untracked) files from the current Git working tree?
  16. Reordering of commits
  17. Depend on a branch or tag using a git URL in a package.json?
  18. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  19. Dynamically Fill Jenkins Choice Parameter With Git Branches In a Specified Repo
  20. Git commits are duplicated in the same branch after doing a rebase
  21. Switch Git branch without files checkout
  22. Which characters are illegal within a branch name?
  23. Git: How to find out on which branch a tag is?
  24. Renaming a branch in GitHub
  25. Git: Merge a Remote branch locally
  26. Switch branch names in git
  27. Git rebase branch with all parent branches (or dependent sub-branches)
  28. How do I run git log to see changes only for a specific branch?
  29. git push error: src refspec main does not match any on linux
  30. git branch permissions

Leave a Comment