git svn workflow – feature branches and merge

by

SVN cannot handle non-linear history (it simply has no notation of it). So what you want to do is a rebase instead of a merge as it preserves linear history with SVN (this is indicated in on the git-svn man page here.

To elaborate, linear histories are trivial. They go in a straight line (A to B to C to D). Whereas non-linear histories can go from (A to B to C, B to D then C + D to E–in other words, they off sprout into branches).

Rebasing will give you a linear history. Remember that rebases should be done from your private local-only branches. For instances, if you have 2 branches: master and experimental. You would checkout experimental and do ‘git rebase master’ preferably with the -i flag. Doing it the other way around may result in undesirable side effects.

It is then you checkout master and merge in the changes from the experimental branch. Your history should remain linear.

More Related Contents:

  1. git-svn: how do I create a new svn branch via git?
  2. git-svn: what’s the equivalent to `svn switch –relocate`?
  3. How do I discard unstaged changes in Git?
  4. Why do I need to explicitly push a new branch?
  5. Git workflow and rebase vs merge questions
  6. Committing Machine Specific Configuration Files
  7. What does “Git push non-fast-forward updates were rejected” mean?
  8. Is it possible for git-merge to ignore line-ending differences?
  9. Vendor Branches in Git
  10. Gitlab repository mirroring
  11. What is the Git equivalent for revision number?
  12. How do I delete all Git branches which have been merged?
  13. Moving from CVS to Git: $Id$ equivalent?
  14. Git log output to XML, JSON, or YAML?
  15. What are the differences between local branch, local tracking branch, remote branch and remote tracking branch?
  16. How to update a pull request from forked repo?
  17. How can I create a Git repository with the default branch name other than “master”?
  18. Flexible vs static branching (Git vs Clearcase/Accurev)
  19. Git allows for branch change with unstaged changes
  20. What’s the significance of the “No newline at end of file” log?
  21. Git: How to remove file from index without deleting files from any repository
  22. How to list branches that contain an equivalent commit
  23. Alter repository directory structure using sparse checkout
  24. Git: How to rebase to a specific commit?
  25. Git: Ignore files for public repository, but not for private
  26. Git Interactive Merge?
  27. git merge different repositories?
  28. How to get Git diff of the first commit?
  29. How to convert a Git repo to a submodule, which is nested in another (parent) Git repo?
  30. Limiting file size in git repository

Leave a Comment