[gmx-developers] Bug merging from release to master

[Roland Schulz]

On Thu, Mar 10, 2011 at 5:44 AM,  <mwolf at gwdg.de> wrote:
> I want to merge release-4-5-patches and master after a bugfix. I get
> conflicts that are not related to my changes. If I understand the
> discussion correct this comes from the code movement that has happened in
> master.
For me it has helped before to set
git config merge.renameLimit 3000
If you then redo the merge it might be able to merge it correctly.

Roland



-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309