Delphi XE8 and Git

Hello,

Where can I find more information about the XE8 and Git integration?

I have set up Git and I can clone a repository, add new files, commit
and push.


However, I just had my first merge attempts and it was a nightmare! I
have spent over 4 hours reading and trying to do a merge of a single
file.

I did a commit, then a pull to get any new versions, and got a message
that the auto merge fialed. It does not pop anything to show the
differences. I found a history on the file right click in the Delphi
IDE and do a compare from there. Did the merge manually and saved.

Any attempt to do a commit on the merged file simply pops:
Unknown error.

How are merging supposed to work with XE8 and Git? The DocWiki is no
help at all.
0
Jako
7/21/2015 5:19:55 PM
embarcadero.delphi.ide 3925 articles. 0 followers. Follow

3 Replies
1335 Views

Similar Articles

[PageSpeed] 50

The docwiki refers you to  http://www.git-scm.com/. I expect that is 
your best resource.

Jako Grobler wrote:
> Hello,
>
> Where can I find more information about the XE8 and Git integration?
>
> I have set up Git and I can clone a repository, add new files, commit
> and push.
>
>
> However, I just had my first merge attempts and it was a nightmare! I
> have spent over 4 hours reading and trying to do a merge of a single
> file.
>
> I did a commit, then a pull to get any new versions, and got a message
> that the auto merge fialed. It does not pop anything to show the
> differences. I found a history on the file right click in the Delphi
> IDE and do a compare from there. Did the merge manually and saved.
>
> Any attempt to do a commit on the merged file simply pops:
> Unknown error.
>
> How are merging supposed to work with XE8 and Git? The DocWiki is no
> help at all.
>
0
quinn
7/21/2015 5:43:18 PM
Jako wrote:

> Where can I find more information about the XE8 and Git integration?

Have you read the documentation yet?

http://docwiki.embarcadero.com/RADStudio/XE8/en/Git_Integration_in_the_IDE

> How are merging supposed to work with XE8 and Git? The DocWiki is no
> help at all.

Yeah, I don't see "git merge" on the list of supported commands.

http://git-scm.com/docs/git-merge

http://docwiki.embarcadero.com/RADStudio/XE8/en/Git_Commands_in_RAD_Studio

Have you tried using a different GIT client to perform the merge?

-- 
Remy Lebeau (TeamB)
0
Remy
7/21/2015 5:44:15 PM
Remy Lebeau (TeamB) wrote:

> Jako wrote:
> 
> > Where can I find more information about the XE8 and Git integration?
> 
> Have you read the documentation yet?
> 
>
http://docwiki.embarcadero.com/RADStudio/XE8/en/Git_Integration_in_the_IDE
> 

Yes, but that was no help at all. It does not mention merging in Git
anywhere, and it is such a fundamental source control concept.

> > How are merging supposed to work with XE8 and Git? The DocWiki is no
> > help at all.
> 
> Yeah, I don't see "git merge" on the list of supported commands.
> 
> http://git-scm.com/docs/git-merge
> 
>
http://docwiki.embarcadero.com/RADStudio/XE8/en/Git_Commands_in_RAD_Studio
> 
> Have you tried using a different GIT client to perform the merge?

I have spent over 16 hours now just with attempts to merge and
committing the merge from Delphi. No luck. It seems the Git and Delphi
IDE integration is practically useless and only good for very
simplistic source code control for a single developer.

I am now testing vsDiffMerge that comes with Visual Studio to do my
Delphi code merges, and I can finally get some work done. My boss
insists on using Git going forward. It is a bit ackward because I have
to open a command prompt every time, go to my dev folder, then run "Git
mergetool" so that it helps me identify the files that require merging.

Oh, and always close the project in Delphi first because every time you
do a merge on a DPROJ file Delphi will detect the change, ask you to
re-open, then randomly change the order of some of the XML elements in
the DPROJ and Git will show the DPROJ as edited and requiring a merge
again, in an endless loop.
0
Jako
7/23/2015 3:21:31 PM
Reply:

Similar Artilces:

Delphi and Delphi for .Net
It seems that Delphi for .Net is slower than Delphi Win32 native applicaiton. I would like to know is it true all .Net application is slower than Win32 native applicaiton or it is Delphi for .Net only. Your information is great appreciated, Inung On 2011-06-21 18:20:17 +0100, Inung Huang said: > It seems that Delphi for .Net is slower than Delphi Win32 native applicaiton. > I would like to know is it true all .Net application is slower than > Win32 native applicaiton or it is Delphi for .Net only. If you are only running the code in the application once then, yes, yo...

Delphi 2006 vs Delphi 2009 IDE stability
Hello, all. I have medium sized project which includes about 20Mb of source code (just size of *.pas files). I use Delphi 2006. There are third party component suites JVCL, DevExpress Bars, Pegasus Imaging. All updates applied. The main problem is IDE stability. About four..five times a day IDE become unstable after intensive usage of code insight functions (most often I press Ctrl+Space key). The best outcome is that I have to save everything and restart the IDE. The worst outcome is when IDE stalls or falls into endless loop of error messages and any unsaved work is lost. OS...

Delphi XE8 Random IDE crashes
For the first time in recent memory, my Delphi IDE is just plain unstable. I'm using XE8 Update 1 and of course, with /NOCASTALIA. I have removed everything I can from Delphi and still use it (no IDE plugins, etc). I've only recently begun using XE8 (as in the last few weeks.) I am only working with VCL projects. Obviously this is not a place to post bug reports. But even if it were, I couldn't. When the IDE crashes, there is NO useful information. When I distribute my own applications, I use MadExcept so that users can provide me with useful information if some...

Re: Where is data form wizard in Delphi 2009? [pubic.delphi.ide]
This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. --JivePart=_21560.zeB8CwDOH5aMJzMl Content-Type: text/plain; charset="Utf-8" Sample picture showing drag and drop from persistent fields edit window. (Any TField in any TDataset should work, TSomeKindofTable, or TSomeKindofQuery. Warren --JivePart=_21560.zeB8CwDOH5aMJzMl Content-Type: image/jpeg; name="drag_and_drop_from_persistent_fields_editor.jpg" Content-Transfer-Encoding: base64 Content-Disposition: attachment; ...

Is it posible to configure Delphi XE3 IDE to use Delphi 7 compiler/debuger
Hi! Like many other developer out there I have several project which has been developed with older version of Delphi (Delphi 7). Since theese projects rely on some components which are not compatible with newer versions of Delphi (no newer versions available) I'm forced to do any maintnance on theese projects using Delphi 7. Another solution would be to find replacment components which would provide me with same capabilities and work with latest versions of Delphi. But this would probbably require compleete rewritings of my projects (lots and lots of work). So currently I'm using...

HTML Editor Library trial is now available for Delphi 6
HTML Editor Library trial is now available for Delphi 6 - Delphi XE8 Please use the following link to download the trial: http://delphihtmlcomponents.com/editor.html Hi! Do you have another emailadress than the support@delphihtmlcomponents.com, because I would like to upgrade to the Editor-package, but I can't email you. Gruß aus den Bergen Günter Please use asviridenkov at gmail.com > {quote:title=G|nter Kieninger wrote:}{quote} > Hi! > > Do you have another emailadress than the > support@delphihtmlcomponents.com, because I would like t...

SEPA components for Delphi with Source Code (Delphi 5
Hi all, in the european union change next year the Bankingformat to the SEPA Format. All peoples and companies must change the bankingssoftware and the costumer data form acountnummers in the new IBAN and BIC numbers. See: http://www.arma-it.de/shop/artikelueber.php?wgruppeid=211&wgruppe_offen=211 Functions: - generate SEPA XML'S - Calc IBAN - BIC Database (DE,AT and CH) Questions: vertrieb@arma-it.de PS: Bankinssoftware for Develpoers (Germany only) http://www.arma-it.de/shop/artikelueber.php?wgruppeid=212&wgruppe_offen=212 El 26/10/13 21:38, A...

Delphi 7 to Delphi XE
Have been using Delphi 7 for many moons ( have got later versions but never upgraded to ) My first problem is: Component Palette. in XE it is a small toolbar docked in top right in Delphi 7 it gives a large view of all the components. I am struggling to be able to cope/access my components.in Delphi XE. Can I make the component pallette tool bar the same size as Delphi 7, or is there a fast way to view/choose all available components in XE, that I have not spotted yet? Kind Regards, Robert. Hi, What I know is that in Delphi 2010 and XE you can choose between t...

Delphi for PHP or Delphi PRISM
Hi, I have the opportunity to develop a web-based library management system. Nothing fancy, just being able to do the usual CRUD stuff for books and provide a search facility. Borrowing is to be done via an email request to the library admin who then sends out the book(s). Since both Delphi for PHP and Delphi PRISM will enable me to develop the app, which one will allow me to deliver it in less time and also increase (even how small) my marketability as a web developer? Thanks. Phillip Flores Phillip Flores wrote: > Hi, > > I have the opportunity to develop a...

Delphi 4 to Delphi 2009
Hello, Thanks to all who answered my previous question. That was a great help. And atlast our client agreed to upgrade our delphi version from 4 to Delphi 2009. *Sigh*. But before that, I need to give the estimation and cost regarding the migration to delphi 2009. Can anyone tell me is there any tool to migrate from delphi 4 to delphi 2009 or just I need to compile our Delphi 4 application in Delphi 2009. I have read from the delphi 2009 feature matrix that Delphi 1 through Delphi 2007 import is possible in delphi 2009. But i am not that sure considering the size of our application. ...

Delphi XE / Delphi 2010
Hello! I noticed that Embarcadero® Delphi® 2010 Version is not on the list of products on Embarcadero page. Or is it still possible to buy it? Will RAD Studio XE compile programs written in Delphi 2010 without problems.? Thanks. Am 13.09.2010 09:04, schrieb Petra Nemec: > Will RAD Studio XE compile programs written in Delphi 2010 without problems.? As always you will probably have to recreate the projects as the import is still a bit -- special. Christian Hello! Does anybody know if it is still possible to get a Delphi2010 trial version (if yes where)? ...

Delphi 5 to Delphi 6 and up
Dear List, Trying to add 7Zip compression support to my delphi application. I am using the ported 7Zip sdk (see their website, they have a link). I am stumped on how to rewrite a single function: function ReverseDecode(var Models: array of SmallInt; ....): ..... where the input is mostly a fixed size array of SmallInt. This code perfectly compiles and functions in Delphi 6 and up, but in Delphi 5 I get the error: There is no overloaded version of 'ReverseDecode' that can be called with these arguments And obviously, the input (fixed) isn't the same as the param de...

Delphi 5 to Delphi XE4
Thinking about making the conversion. Of course we have numerous components such as: TurboPower AsyncPro, TurboPower Orpheus ICS2 Synactis All-In-The-Box. You guys have any advice as to the effort and time it may possibly take. It is a large application, several hundred thousand lines. And that's what happens when using third party components, a lot of extra work. I have been burned a few times. I now minimize the use to a few well known suppliers, like TMS. I have "banned" a lot of other components. Regards, Ole > > Thinking about making the conver...

Delphi 4 to Delphi 2007
Hello, I will have to port a D4 application (with source) to D2007. what kind of problem could I face ? I will have to go to customer site tommorow to analyse its source code to quote the work, what should I care of to hestimate the porting time ? Thanks John Terry wrote: > Hello, > I will have to port a D4 application (with source) to D2007. > what kind of problem could I face ? > I will have to go to customer site tommorow to analyse its source code > to quote the work, what should I care of to hestimate the porting time ? You can probably do it by just changi...

Web resources about - Delphi XE8 and Git - embarcadero.delphi.ide

Delphi - Wikipedia, the free encyclopedia
... an archaeological site and a modern town in Greece on the south-western spur of Mount Parnassus in the valley of Phocis . The site of Delphi ...

Delphi Automotive (@DelphiAuto) on Twitter
Log in Sign up You are on Twitter Mobile because you are using an old version of Internet Explorer. Learn more here Delphi Automotive @ DelphiAuto ...

Delphi Connect for Verizon on the App Store on iTunes
Get Delphi Connect for Verizon on the App Store. See screenshots and ratings, and read customer reviews.


Audi working with Delphi to develop autonomous car tech
Audi is developing an iPad-sized device that will pack all the necessary computing power for a self-driving car

US approves China company's acquisition of Delphi biz
The Committee on Foreign Investment in the United States has formally approved the acquisition of Delphi's global production of braking systems ...

Verizon And Delphi Officially Launch Vehicle Diagnostics Service - $250 For The Module, $5 A Month On ...
If you're a car nut, a paranoid parent, or a small business owner looking to do a little, uh, company vehicle economy analysis, Verizon's teamed ...

Watch out Google: Delphi gives Ars a ride in its self-driving car
The automotive components maker gave Ars a preview ride around the neighborhood. MOUNTAIN VIEW, CA—On Thursday morning I met with Delphi at its ...

The skinny on Delphi's autonomous road trip across the United States
Filed under: Green , Videos , Autonomous Last week, Delphi's autonomous car became the first to complete a coast-to-coast trip across the United ...

Delphi partners with WiTricity on automated wireless charging system
One could easily argue that parking between the white lines at any local hangout presents a challenge for some inexperienced drivers. So, why ...

Resources last updated: 11/25/2015 10:18:48 PM