×
The internal search function is temporarily non-functional. The current search engine is no longer viable and we are researching alternatives.
As a stop gap measure, we are using Google's custom search engine service.
If you know of an easy to use, open source, search engine ... please contact support@midrange.com.
Is anyone using the eGit plugin for RPG version control ?
While this seems to work fine in single user mode (not the main idea of version control) I can't get a simple conflict working when two developers touch the same code. Either this is an eGit issue or my knowledge of Git might me missing something.
My test scenario is based on having twice the same repository loaded (offcourse with a different base directory) so I have two different IBM i projects. Performing a change on Project 1, member A, Commit & Push this works fine.
The problem starts when I change Project 2, member A. Trying to commit and push this results in a rejected message, so far so good, but trying a pull then results in my project being marked as "Rebase w/ merge origin/master" ? (and I do get the red conflict marks)
Strangely this is different from by previous attempts where I didn't get the red conflict marks ?? (or did I somehow mess up my repository) ?
Anyway, looking for other RDI/eGit users...
Kind regards,
Paul
As an Amazon Associate we earn from qualifying purchases.
This mailing list archive is Copyright 1997-2024 by midrange.com and David Gibbs as a compilation work. Use of the archive is restricted to research of a business or technical nature. Any other uses are prohibited. Full details are available on our policy page. If you have questions about this, please contact
[javascript protected email address].
Operating expenses for this site are earned using the Amazon Associate program and Google Adsense.
midrange.com
