[Bioc-devel] Merging git mirror and previous git repo ?

[Mike]

Here is what I did to resolve the conflicts when merging from master to 
devel.

     git clonehttps://github.com/sneumann/mtbls2/
     update_remotes.sh
     git checkout master
     making some changes and commit to master...
     git checkout devel
     git rebase	
     git log #to get the git-svn starting point commit
     git checkout master
     git merge -s ours git_svn_starting_point_commit_id #won't do anything but interconnect git and git-svn branches so they are not totally different
     git checkout devel
     git merge --squash master
     git commit -am "comments"
     git svn dcommit



On 09/21/2015 10:41 AM, bioc-devel-request at r-project.org wrote:
> Subject:
> Re: [Bioc-devel] Merging git mirror and previous git repo ?
> From:
> Jim Hester <james.f.hester at gmail.com>
> Date:
> 09/21/2015 06:38 AM
>
> To:
> Steffen Neumann <sneumann at ipb-halle.de>
> CC:
> "bioc-devel at r-project.org" <bioc-devel at r-project.org>
>
>
> This situation is complicated due to deficiencies in git-svn.  The safest
> (and most limiting) thing to do is to
>      git clonehttps://github.com/sneumann/mtbls2/
>      update_remotes.sh
>      git checkout devel
>
> Then restrict all further development to the `devel` branch, sync it with
> SVN via `git svn rebase` and avoid doing any git merges.
>
> Alternatively you can continue development on the `master` branch and `git
> cherry-pick` revisions you want to add onto the `devel` branch.
>
> Doing `git merge` and more complicated things can cause `git svn` conflicts
> that are sometimes challenging to resolve.


	[[alternative HTML version deleted]]