198 replies to this topic

[Stigarta]

...................................

Edited by Stigarta, 17 November 2012 - 18:36.

[pieterg]

I am pretty sure it is working...
now we need someone with 2.1 environment ready, and a few GBs & moments hours to wait and confirm ...

applied (build-tested)

[delagroov]

@Littlesat

How can i merge your latest commit https://github.com/l...ull/146/commits into my fork??

I am using Smartgit, but i dont see what procedure I have to use ..

Can you clarify this..

Edited by delagroov, 18 November 2012 - 20:52.

[pieterg]

if you just want a single commit, use 'git fetch origin; git cherrypick <commithash>' (or whatever nice graphical userinterface smartgit has built around that)

[delagroov]

The fork and directory is renamed and i dont see the method to merge the commit of Littlesat

and my skin.xml has added stuff, so how does a merge knows where to place it in my skin.xml

[pieterg]

that's why you should not just merge the entire repository, but cherry-pick a single commit.
Usually git is very good at merging, and if it cannot work it out, you need to manually resolve the final conflicts.

[delagroov]

Dont undertand what you mean now

When i fork Pli hd its the complete repository,

[pieterg]

yes, but if you now merge pli-hd again, you'll get a lot of conflicts.
You asked about a single commit, and that's what 'git cherry-pick' is for.

[delagroov]

yes but the problem is how to get that cherry pick?

When i am in my smargit PLi-Full-HD-Night repository i only see my commits and can t see commits for Pli HD

When I am in Pli hd repository i se commits from littlesat but cant find a way or see an option to cherry pick into mine repository

Edited by delagroov, 19 November 2012 - 10:01.

[pieterg]

as you forked from pli-hd, you should probably have the pli-hd repository in your remotes.
What does
git branch -a
say? (or the corresponding smartgit gui command)

[delagroov]

No I deleted Pli hd and added Pli-Full-HD-Night in my fork

Should I reverse the deletion of PLi Hd to get this working okay

Edited by delagroov, 19 November 2012 - 10:05.

[pieterg]

ok, so you no longer have a fork, but just copied files?
In that case, merging might be a bit harder.
But cherry-picking would still work.

Add a remote:

git remote add plihd git://github.com/littlesat/skin-PLiHD.git
git fetch plihd

and cherry-pick from it:

git cherry-pick <commithash>

[delagroov]

No I deleted Pli hd and added Pli-Full-HD-Night in my fork

Should I reverse the deletion of PLi Hd to get this working okay

But that woud gave a problem when you use my git for imagebaking i suppose..

[delagroov]

ok, so you no longer have a fork, but just copied files?
In that case, merging might be a bit harder.
But cherry-picking would still work.

Add a remote:

git remote add plihd git://github.com/littlesat/skin-PLiHD.git
git fetch plihd

and cherry-pick from it:

git cherry-pick <commithash>

When i reverse my commit deletion of PLi-HD in my repository...would that have the same effect

[pieterg]

no, the thing is you need to add pli-hd as a 'remote' repository.
Deleting a subdirectory, or reverting that deletion does not effect that.
I was assuming you started your repository as a fork. In that case, you would have the remote set up already.
But if you started with an empty repository, and copied some files into it, you'd have to add the remote by hand (because your repository is not related to the pli-hd repository)

[delagroov]

I did nt start with empty remote..i forked Pli hd..see signature
You find the first commit where i deleted Pli Hd directory
https://github.com/d...71f8729c550a172

and added Pli_Full-HD-Night
https://github.com/d...7875f120890978d

So thats why i assume when i revert the deletion...it s the same
Only waht happens the when using my git location for imagebuilding when ther is also Pli hd folder..

[pieterg]

No need to revert that commit, that doesn't affect git's knowledge of remote repositories.

The cherry-pick procedure is the same in any case.

[delagroov]

Now i still dont understand...i cannot cherry pick

[pieterg]

I can only tell you the git command line commands. How to do it with smartgit, somebody who knows smartgit might be able to help.

[delagroov]

Okay and i have no idea how to acces with command...