Merge RealThunder transparancy stuff?

[drmacro]

I'd really appreciate if a few of you who are able to would compile and run PR 7888 and leave your feedback in the GitHub discussion. I myself don't really plan on using the feature so it's hard for me to evaluate whether it's working as people want it to, I can only evaluate the code technicalities.

I built it.

Seems to work as advertised.

When FC starts it throws a warning: Cannot find icon: cursor-through

[Kunda1]

When FC starts it throws a warning: Cannot find icon: cursor-through

Can you notate the PR so that RT knows about this (in case he doesn't see it here?)

[drmacro]

When FC starts it throws a warning: Cannot find icon: cursor-through

Can you notate the PR so that RT knows about this (in case he doesn't see it here?)

Done.

[obelisk79]

Edit: removed due to not being related to this PR

[drmacro]

Once again I have reached the limits of my understanding of the git and PR build processes.

I built PR7888 the other day. No problem.

But, now when I attempt to do a git pull in the source directory I get the following:

Code: Select all

git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> PR7888

I don't get the implications here.

Has the PR branch changed?

Checking the local branch shows:

Code: Select all

git branch
* PR7888
  master

[user1234]

Disclaimer: just said, for me is also git pretty hard to understand, since i do not often work with that.

I built PR7888 the other day. No problem.

But, now when I attempt to do a git pull in the source directory I get the following

That is normal. Before you maybe just make a git clone. After you clone and update the branch and make a git pull, git asking always this question, to specificity which kind of pull you want/mean. When you just always update the repository, you have to

Code: Select all

git pull --ff-only

or you specify it in general, like the massage showed up.

Greetings
user1234

[drmacro]

...

Code: Select all

git pull --ff-only

...

Thanks.

Doing that produces similar gibberish (at least to me ):

Code: Select all

git pull --ff-only
remote: Enumerating objects: 55, done.
remote: Counting objects: 100% (55/55), done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 55 (delta 35), reused 47 (delta 31), pack-reused 0
Unpacking objects: 100% (55/55), 38.44 KiB | 531.00 KiB/s, done.
From https://github.com/FreeCAD/FreeCAD
   8b85903dff..7ce5c2dcf4  master                -> origin/master
   74e5a76759..1fd8b8cd7f  releases/FreeCAD-0-20 -> origin/releases/FreeCAD-0-20
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> PR7888

[user1234]

Doing that produces similar gibberish (at least to me

Is there a branch removed, which you have set as actual working branch?

Greetings
user1234

[drmacro]

Doing that produces similar gibberish (at least to me

Is there a branch removed, which you have set as actual working branch?

Greetings
user1234

I did the following to create this source directory:

Code: Select all

git clone https://github.com/FreeCAD/FreeCAD.git freecadPR7888
cd freecadPR7888
git fetch origin pull/5216/head:PR5216
git branch
git checkout PR5216

Then proceeded to build.

Then a few days later attempted a git pull and received the previously mentioned responses.

[adrianinsaval]

maybe try

Code: Select all

git pull origin pull/5216/head