U++ forum: Welcome to the forum

Status & Roadmap

Authors & License

Funding Ultimate++

Search on this site

Search in forums

Home » Developing U++ » U++ Developers corner » GIT support integration to the IDE (Can you help to improve GIT support in the IDE? Test the prototype!)

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

Return to the default flat view

Create a new topic

Submit Reply

Re: GIT support integration to the IDE [message #47049 is a reply to message #47046]

Sun, 20 November 2016 20:21

coolman is currently offline

coolman
Messages: 114
Registered: April 2006
Location: Czech Republic

Experienced Member

deep wrote on Sat, 19 November 2016 16:16

Hi,

The present Trunk in main repo is different than what you have used.

To use your modifications with current HEAD in git will require the patch for your changes.

You used some branch of IDE and then created your additions for git integration.

Can you create patch with ref to your original ide branch.

I would like to use patch to current HEAD.

Hi,

Thanks for the explanation. But you can create the diff yourself.
1. Clone the GIT repository

git clone https://github.com/CoolmanCZ/mirror upp_git

2. Add remote upstream to the trunk repository

cd upp_git
git remote add upstream https://github.com/ultimatepp/mirror

3. Create the diff

git diff upstream/master..HEAD

When you are using the IDE from the U++ GIT repository and you already have the upstream configured, you don't need the patch. You can merge the changes from the upstream to the U++ GIT repository using integrated merge function.

Best regards, Radek

Edit: I am trying to keep the U++ GIT repository up to date with the latest trunk version of the IDE.

[Updated on: Sun, 20 November 2016 20:48]

Report message to a moderator

Send a private message to this user

[Message index]

		GIT support integration to the IDE By: coolman on Tue, 08 November 2016 12:31
		Re: GIT support integration to the IDE By: mr_ped on Tue, 08 November 2016 23:24
		Re: GIT support integration to the IDE By: deep on Wed, 09 November 2016 15:44
		Re: GIT support integration to the IDE By: deep on Sat, 19 November 2016 15:09
		Re: GIT support integration to the IDE By: coolman on Sat, 19 November 2016 15:33
		Re: GIT support integration to the IDE By: deep on Sat, 19 November 2016 16:16
		Re: GIT support integration to the IDE By: coolman on Sun, 20 November 2016 20:21
		Re: GIT support integration to the IDE By: deep on Mon, 21 November 2016 05:43
		Re: GIT support integration to the IDE By: coolman on Wed, 24 January 2018 17:52
		Re: GIT support integration to the IDE By: Klugier on Wed, 24 January 2018 21:13
		Re: GIT support integration to the IDE By: coolman on Thu, 25 January 2018 07:40
		Re: GIT support integration to the IDE By: mirek on Thu, 25 January 2018 11:12
		Re: GIT support integration to the IDE By: coolman on Thu, 25 January 2018 12:11
		Re: GIT support integration to the IDE By: coolman on Thu, 07 June 2018 13:25

Previous Topic:	SortedVectorMap - attempting to reference a deleted function error
Next Topic:	Android port

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

PDF

]

Current Time: Wed May 08 03:53:56 CEST 2024

Total time taken to generate the page: 0.02531 seconds