Hi all,
I've searched for an answer, but can't find anything... bitbucket is telling
me I have merge conflicts with petsc-dev
when I ask it to sync with petsc-dev. I can't find a way to merge just some of
the commits to petsc-dev to figure out
where the conflict is. Is there a way to do this through bitbucket? I don't
see a way to do this locally, since that's
just a clone of the fork.
Thanks.
- tim
--
================================================================
"You will keep in perfect peace him whose mind is
steadfast, because he trusts in you." Isaiah 26:3
Tim Tautges Argonne National Laboratory
(tautges at mcs.anl.gov) (telecommuting from UW-Madison)
phone (gvoice): (608) 354-1459 1500 Engineering Dr.
fax: (608) 263-4499 Madison, WI 53706
