git-svn is a bidirectional bridge between git and Subversion.
0
votes
1answer
15 views
Git: Use git-merge-file to resolve conflicts using theirs/ours
I have don a git svn rebase and I got a conflict. I want to use git-merge-file to merge the two versions of the file by choosing the version on the server. git-merge-file has this option called ...
0
votes
1answer
28 views
Git: Diff a list of files
Is it possible to add a list of files somewhere to a changelist or file or something, and to run git diff commit1 commit2 myListOfFiles and to get the diff of just that list of files? Or is it ...
0
votes
0answers
27 views
Ability of Jenkins to checkin in SVN repository
I am new to Jenkins, so please do forgive me if the question is stupid.
I have a project in GIT. and I have configured it in Jenkins.
The same project also exists in a svn repo.
Now, whenever there ...
0
votes
0answers
8 views
How should I merge an SVN branch after migrating the repo to Git?
I migrated a SourceForge.net project from Subversion to Git using (mostly) the instructions at http://chris.iluo.net/blog/2009/08/28/moving-from-svn-to-git/.
It imported my branches and trunk ...
2
votes
1answer
34 views
Why parent is stored in git notes?
The way git store notes:
Git only store one note per commit for single namespace. One can have multiple namespace. Default namespace is commit.
.git/refs/notes/ contain one hash (say, MainHash_2), ...
1
vote
2answers
30 views
How to undo branch push to master
Okay, so I have a forked repo on GitHub, and the upstream repo hasn't been updated since I forked it. Yesterday, I created a branch based from the very last upstream commit which was made before I ...
0
votes
0answers
15 views
Recover git-svn mirror after svn repository was “rolled back”
How can i repair my git-svn mirror repository?
It is set up with git svn init ..., then github remote was added. The cron job is doing git svn rebase && git push periodically.
Everything was ...
0
votes
1answer
14 views
git svn “Unable to determine upstream SVN information from working tree directory”
I have a git repo that was initially cloned from an svn repo.
When I tried a
git svn rebase
I'm getting
Unable to determine upstream SVN information from working tree history
I have ...
0
votes
1answer
22 views
git svn shows not correct merge graph
I use git svn bridge and have created some branches that I merged back into master, the problem is if a co-worker fetches the same repo with git-svn, the merge is not shown in his log.
git ...
0
votes
2answers
16 views
Git pre-svn-dcommit hook
I work on a remote SVN repository using git-svn and I use git-flow workflow for my local development.
Unfortunately accidentally a couple of times I did the svn dcommit while being on a feature ...
0
votes
1answer
12 views
Git-svn - determine branch being tracked?
Is it possible to determine which branch (if any) is being tracked with git-svn? (in bash)
Thanks!
0
votes
1answer
15 views
Git-svn: determine number of commits ahead or behind
Is there a way with git-svn to determine how many commits ahead or behind I am?
Thanks!
0
votes
0answers
13 views
Fastest way to migrate big svn repo to Git
I am interested to know what is the fastest/best way to migrate a big project from our svn server (svn server is multi project and has 330000 rev in total).
Uur svn has following structure :
svn
- ...
0
votes
1answer
16 views
Git-SVN: how can i merge branch to trunk?
I am working on a git-svn project with two branches, lets call them
trunk
branches/foo
How can i merge branches/foo to trunk?
they both have the latest update
Thanks
1
vote
1answer
45 views
Git: git status takes too long
I'm working on a project where the version control system is SVN and I want to use git. I did a git svn clone but git status works terribly slow (around 8 minutes). The repository has around 63000 ...
