How to Git with PcmHacks in Visual Studio

They go by many names, P01, P59, VPW, '0411 etc . Circa 1999 to 2006. All VPW OBD2 PCMs.
User avatar
Posts: 1392
Joined: Sat Dec 15, 2018 7:38 am

How to Git with PcmHacks in Visual Studio

Postby Gampy » Tue Jan 11, 2022 10:51 pm

Many many people have difficulties getting involved in an existing Github project.

The most common mistake is cloning the repository they want to contribute to, DO NOT DO THAT!
First create a Fork of that repository, then clone that fork ...

The second biggest mistake is not creating a private branch, thus making changes to the 'Master' branch (In PcmHacks case it's called 'develop' ... :?), DO NOT DO THAT!
Create your own branch, make your changes in that branch, commit them to that branch, then push that branch to your fork, then create a pull request from your fork.

The next mistake is miss understanding the Origin / Upstream naming, I must admit it is confusing, but not if you look at it right.
Your fork is Origin, it's the origin of your clone ... The repository that you forked, is Upstream of your fork!
Local clone -> Origin (Your fork) -> Upstream (The repository you forked).

You pull from upstream, you push to origin.

Simply stated steps ...
Remote,
. . Fork a repository
Local,
. . Clone that fork local
. . Create the canonical name 'upstream' (it points to the repository you forked, origin points to your fork and is automatically created)
. . Create a local branch
. . . . Make your modifications
. . . . Commit the changes
. . . . Push that branch to your fork
Remote,
. . Create a pull request from your fork ...
------
After it's accepted (if it is :roll:) ...
Local,
. . Pull the upstream repository to update the local clone
. . Push the local clone to update the fork


I am NOT A DOCUMENT WRITER, I do the best I can!
I abhor Git in Visual Studio ... I prefer Git in a Unix CLI.

However I whipped up this in hopes it would help others Git involved ... Enjoy!
2022-01-11
GitWithPcmHacks-v2.pdf
(899.17 KiB) Downloaded 11 times
2022-01-15
GitWithPcmHacks-v2.1.pdf
(728.88 KiB) Downloaded 4 times

I will keep this location Updated.

Comments, Improvements, Corrections, Critiques welcome ...

As always, I'm am ALWAYS willing to help anyone ... To the point of sticking my nose in where it's not wanted sometimes!
But that's me, don't like it (or me), go suck an egg ... :)
Intelligence is in the details!

It is easier not to learn bad habits, then it is to break them!

If I was here to win a popularity contest, their would be no point, so I wouldn't be here!

User avatar
Posts: 2609
Joined: Thu May 17, 2012 8:53 pm
Location: WA

Re: How to Git with PcmHacks in Visual Studio

Postby Tazzi » Wed Jan 12, 2022 12:17 pm

Thankyou for this. Personally am terrible with understanding how the whole request pull and merging works. Possibly a tutorial on that would help!

I just always make a new brank, clone the master into it and then make the edits from there. After that.. I havent been game enough to merge after a fuck up near the beginning of the project haha
Your Local Aussie Reverse Engineer
Site:www.envyouscustoms.com
Mob:+61406 140 726
Image

User avatar
Posts: 1392
Joined: Sat Dec 15, 2018 7:38 am

Re: How to Git with PcmHacks in Visual Studio

Postby Gampy » Thu Jan 13, 2022 12:50 am

Not sure I understand the question, it's a bit jumbled, it looks like you want to do PR merges into your own repository, thankfully GitHub has made that easier by including that functionally in GitHub and it's point and click now.

NOTICE! This comment is for owners of a repository, not for contributors to forked repositories!

Previously it would have been (from the CLI),
checkout master
pull origin master
checkout -b feature
pull origin pull/PR#/head
rebase master
checkout master
merge feature
push origin master
and is still my preferred method ... It's cleaner!

And of course you'll want to wipe when done,
branch -d feature
no brown stripes left behind!

One thing I do HIGHLY recommend for those wanting to smooth out their Gitmo, is to have multiple (at least two) GitHub accounts, that way you have your own full circle LAB to play in!

-Enjoy
Intelligence is in the details!

It is easier not to learn bad habits, then it is to break them!

If I was here to win a popularity contest, their would be no point, so I wouldn't be here!

User avatar
Posts: 1392
Joined: Sat Dec 15, 2018 7:38 am

Re: How to Git with PcmHacks in Visual Studio

Postby Gampy » Sun Jan 16, 2022 3:00 am

New version up.

Mostly a formatting change, I finally got around to figuring out how to make the only suggestion made, moving the text along side the images.
You know who you are, Thank you!

There are a couple new tips as well, nothing important.

-Enjoy
Intelligence is in the details!

It is easier not to learn bad habits, then it is to break them!

If I was here to win a popularity contest, their would be no point, so I wouldn't be here!

Return to GM LS1 512Kbyte and 1Mbyte

Who is online

Users browsing this forum: No registered users and 4 guests