I'm going to answer my own question:
Its not technically managing conflicts with submodules (ie: keep this
but not that), but I found a way to continue working...and all I had
to do was pay attention to my git status output and reset the
submodules:
git reset HEAD subby
git commit
That would re
Dear all,
I have two branches in my git repository:
master
*branch1
Both branches have commits. Now I hope my branch1 becomes master, and
master becomes "branch2". Which command shall I input? Thanks a lot!
--~--~-~--~~~---~--~~
You received this message because
Have not tried this myself but it looks like (from git help branch)
that you do the following:
git branch -m master m2
git branch -m branch1 master
git branch -m m2 branch1
It swaps the 2 branches.
Cheers,
Andy
On Fri, May 8, 2009 at 4:07 PM, James wrote:
>
> Dear all,
>
> I have two branches
