Databases
StackOverflow2013
Postsdbo
POEndless conflict between remote git repo and svn
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POEndless conflict between remote git repo and svn
    primarykey
    data
    text
    <p>I'm at my wit's end here with a git-to-svn setup I just created. I've setup a repository with two remote repos, one svn based and the other a remote git:</p> <pre><code>svn-remote.svn.url=https://subversion.acme.com/svn/sales/portal/trunk svn-remote.svn.fetch=:refs/remotes/git-svn remote.origin.url=mottinger@git.tkknow.com:/gitroot/acme-gtm-2-0.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* </code></pre> <p>Once I set this up, I was able to move commits from the git repo to the svn repo like this:</p> <pre><code>git fetch origin git rebase origin/master (linearizes commits to svn) git svn rebase git svn dcommit </code></pre> <p>Everything was all fine, until I decided to test how I'd handle conflicts. I created a foo.dat file and added a line in it from the svn side and made a corresponding file on the git side with a line indicating something to the effect it was from git. I ran <code>git fetch origin</code> and <code>git rebase origin/master</code> to bring the foo.dat file down. That was fine, but an attempt to run <code>git svn rebase</code> resulted in a conflict. Perfectly expected, so I go through the steps of editing the conflict and using svn rebase --continue. But then the chaos begins. After an attempt to run <code>git rebase origin/master</code> to pull down other changes from the repo, I conflict on that same foo.dat file. I've gotten it into a state where if I resolve the conflict for svn, it'll fail for git and vice versa. The most frustrating thing of all, I can't seem to find a way to get the repositories back into a state to revert this mess. For now, I have the luxury of being able to completely blow away repos and try again, but in the future as developers use this, if I get myself into a state like this I'd really like to know how to get out. Any tips on what's going on and how to end the constant merges would be hugely appreciated.</p> <p>Thanks!</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USwittyhandle
    1. USwittyhandle
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POEndless conflict between remote git repo and svn
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POEndless conflict between remote git repo and svn
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POEndless conflict between remote git repo and svn
      1. USVonC
      1. VTFavorite
    1. CO> I ran git fetch origin and git svn rebase origin/master — did you mean `git rebase origin/master` there? origin/master is a normal git branch, not git-svn branch, right?
      singulars
      1. POEndless conflict between remote git repo and svn
      1. USvadishev
    2. COThanks @radioversum, I'll edit my post.
      singulars
      1. POEndless conflict between remote git repo and svn
      1. USwittyhandle
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload