Geek asks and answers

Git: A More Effective Way To Do It

This is my regular workflow with git-svn:

  • create a branch for the problem
  • commit after doing some work with the branch
  • validation wizard
  • svn rebase
  • validation branch
  • Update wizard
  • validation wizard
  • branch merge
  • dcommit

My goal is to keep my story in a straight line, and also try to minimize the headache of draining.

Is there a way to do this with smaller steps?

+2
source share
3 answers

There is no need to do your permutation in the middle, and, of course, there is no need to change it to the master branch. My workflow achieves the same and thus:

  • Create a branch for the problem: git checkout -b issue remotes/trunk(which remotes/trunkmay be omitted if I'm already on the branch of interest).

  • .

  • Subversion: git svn dcommit. , , , . , , git svn rebase, git svn dcommit.

    , .

  • : git checkout master.

  • : git svn rebase.

    ; , git svn dcommit a git svn rebase .

git svn ; , , Subversion. , Subversion, git svn dcommit --dry-run

, -. , 4-5 . Subversion.

+1

. , . , rebasing , . , , .

, , , , , , . , . , , :

git push . my-branch:master

, , , , . , , , .

, , .

+1

SubGit git -svn.

SubGit - . Git Subversion, Subversion Git. SubGit Subversion, .. , :

$ subgit configure $SVN_REPOS
$ # Adjust $SVN_REPOS/conf/subgit.conf 
$ #     to specify your branches and tags
$ # Adjust $SVN_REPOS/conf/authors.txt 
$ #     to introduce svn author names to their git counterparts
$ subgit install $SVN_REPOS

Git $SVN_REPOS/.git, Subversion. Git (, git-http-backend), Git Git Subversion.

:

$ git checkout -b foo
$ git commit
$ git checkout master
$ git merge foo or git rebase foo
$ git push

:

  • SubGit git -svn , , mime ..
  • SubGit is a commercial tool with some free options;
  • I am one of the developers of SubGit.
+1
source

More articles:


All Articles