Home/ Questions/Q 7075255
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-28T06:09:19+00:00

We have a git-svn repository. I had no troubles to update the trunk with

  • 0

We have a git-svn repository.
I had no troubles to update the trunk with my local changes (commit + push or commit + merge), however sometimes my colleagues make some fixes in the code and update the git-svn and i want to take his changes without committing mine, since the code is not yet ready for commit (even locally, i might want to revert some of it). I can;t find a way to get his code and merge conflicting changes (i work with ‘tower’ git client on mac os x).

Any way to do the same action an svn ‘update’ command will do ?

10x.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You could stash your current work in order to get a pristine working tree, allowing you to do your git-svn update.
    You can see a similar technique in “How to handle IDE project files with git-svn“.

    Another alternative is through Stacked Git.
    See “How do I track local-only changes/change sets with git-svn?“.

    StGit is a Python application providing similar functionality to Quilt (i.e. pushing/popping patches to/from a stack) on top of Git. *
    These operations are performed using Git commands and the patches are stored as Git commit objects, allowing easy merging of the StGit patches into other repositories using standard Git functionality.

    • 0