Help with git - SOLVED

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
09 May 2025 19:10 - 09 May 2025 20:03 #328097 by zz912
Help with git - SOLVED was created by zz912
Hello,

I am learning git. I cloned data from Github. I compiled it with branches copied from master branche.
I made my first Pull Request with git.
github.com/LinuxCNC/linuxcnc/pull/3434
I celebrated. Everything was fantastic.

Then I needed work with 2.9 branche.

I checked out it:
zdenek@cnc:~/linuxcnc/linuxcnc-zz912$ git checkout 2.9
branch '2.9' set up to track 'origin/2.9'.
Switched to a new branch '2.9'
zdenek@cnc:~/linuxcnc/linuxcnc-zz912$ git branch
* 2.9
  master
  pnc-aut-g43

Then I made:
zdenek@cnc:~/linuxcnc/linuxcnc-zz912/src$ ./autogen.sh
zdenek@cnc:~/linuxcnc/linuxcnc-zz912/src$ ./configure --with-realtime=uspace
zdenek@cnc:~/linuxcnc/linuxcnc-zz912/src$ make -B

.........

Making halcompile manpage constant.9
Making halcompile manpage conv_bit_float.9
Making halcompile manpage conv_bit_s32.9
Making halcompile manpage conv_bit_s64.9
hal/components/conv_bit_s64.comp:3:9: Trying to find one of TYPE
>  pin out s64 out;
>          ^
while parsing Declaration():
>  pin out s64 out;
>     ^
while parsing File():
>  pin out s64 out;
>     ^
make: *** [hal/components/Submakefile:35: ../docs/man/man9/conv_bit_s64.9] Chyba 1

I must do something wrong, because I tried compile branche 2.9 downloaded from Github in zip file and It worked.
I tried git clean and it did not help.

How should I work with different branches with git?
Last edit: 09 May 2025 20:03 by zz912.

Please Log in or Create an account to join the conversation.

More
09 May 2025 19:44 #328100 by PCW
Replied by PCW on topic Help with git
I have seen that with master and 2.9

Did you 

make clean

after changing branches?

 
The following user(s) said Thank You: zz912

Please Log in or Create an account to join the conversation.

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
09 May 2025 19:46 #328101 by zz912
Replied by zz912 on topic Help with git
Yes, I did. But it did not help.

Please Log in or Create an account to join the conversation.

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
09 May 2025 19:49 #328102 by zz912
Replied by zz912 on topic Help with git
Sorry, I made "git clean", I will try "make clean".

Please Log in or Create an account to join the conversation.

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
09 May 2025 20:00 #328103 by zz912
Replied by zz912 on topic Help with git
"make clean" - helped. Thank you.

Please Log in or Create an account to join the conversation.

Time to create page: 0.059 seconds
Powered by Kunena Forum