All Questions
14 questions
0
votes
1
answer
33
views
git-svn migration and git workflow
I have migrated a project from svn to git.
svn had 1)trunk 2)branch1 3)branch2
trunk in svn was a useless and it been out of sync for years with branch1 and branch2.(I am not responsible:))
branch1 ...
1
vote
1
answer
277
views
git-svn always generates unique hashes
I'm working on a project for a long time was hosted in SVN repository, and now is in the process of transitioning to GitHub.
Currently I'm the only developer who works primarily in Git, others work ...
- 2,517
5
votes
2
answers
1k
views
Workflow for using Git SVN and a Remote Git Repository with multiple users
Summary of the question:
I came to realise as I wrote this out that there is a lot of detail, so here's the headline:
What is a good workflow for a team of many users that use SVN and Git SVN within ...
- 6,491
2
votes
3
answers
229
views
git: more efficient way to do this
This is my normal workflow with git-svn:
create a branch for an issue
commit after doing some work on branch
checkout master
svn rebase
checkout branch
rebase master
checkout master
merge branch
...
- 120k
2
votes
1
answer
170
views
Remove already committed git branches
My normal pattern is to branch from master, do a ton of work, then rebase and git svn dcommit. How can I clean up all my old branches?
Basically I want to find any branches that have git-svn-id: in ...
- 50.7k
4
votes
2
answers
692
views
git-svn: How do I avoid 'Merge branch <branchname>' commit messages?
This is my current git-svn workflow:
git checkout -b feature master
# hack commit hack commit
git checkout master
git svn rebase
git merge feature
git svn dcommit
This usually works fine, git replays ...
- 379
5
votes
2
answers
2k
views
git merge vs rebase using git svn
I am very confused, I have read several posts, blogs and articles and don't know where to go. I am using an svn server repo that I pull down with git svn and work on. I am currently the only person ...
- 7,803
12
votes
3
answers
6k
views
git-svn and a remote git repo sync
At my workplace we use SVN for version control. I switched to git-svn when I found out about it, and recently I decided to sync some of my private branches to another remote git repo. The workflow, ...
- 1,181
1
vote
2
answers
287
views
Using git-svn, if I have multiple commits not in svn, how do I only push selected commits to svn?
Let's say I have multiple commits in my local git repository that have not been pushed to svn. For example, these four commits on master.
A <-- B <-- C <-- D
A is the oldest commit not in ...
- 6,156
4
votes
3
answers
161
views
Git through svn - managing files
Perhaps I'm missing something about using gi through svn, but how do I keep around a set of locally modified files without pushing those changes to subversion.
Here's my broken workflow.
(on master)...
- 67.9k
4
votes
1
answer
965
views
looking for ideal git-svn workflow
The company that I'm working is working with SVN but I would like to start working with git to take advantage of the light branching and stashing features (disclaimer, I'm pretty new to git). I've ...
- 18.7k
1
vote
3
answers
134
views
Needing a git-svn workflow suggestion to keep personal files away from svn
I am starting to read about git-svn now to use it with a project that use SVN.
I would like to have some files just for me (todo files, scratch code, etc), and I will like to keep track of them in ...
- 3,049
5
votes
2
answers
807
views
Cherry-picking from git to svn (or, How to keep a project history in git and releases in svn)
I'm in a position where I'm the only one using git, everybody else is using svn. I've used 'git svn' to connect to the team svn and mostly it works just fine. Lately, I've started a project initially ...
- 2,332
17
votes
6
answers
7k
views
git clone of git-svn tree?
I've got a 'git-svn' working tree. I'd like to clone a "pure" git repo off this, and then use git push/pull to move changes between the git-svn tree and the git tree, while also using 'git svn dcommit/...
- 141k