Skip to content

Update local with upstream changes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update local with upstream changes #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4564eca
BobsCoolTool V2
Sep 20, 2024
51cf0a4
Merge branch 'BobTheVendor' into GetBobsV2
Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SuperSpiffyTool/SomeAwesomeCode.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
This unit does not do anything useful, other than demonstrating managing local and upstream changes.

function CoolStuff (int amountofcool)
if amountofcool > 200
if amountofcool > 250 // compromise with bob changes
write "waay too cool for me"

function SuperNewAwesomeFeatureWeNeed (bool OhBoy)
We want this.... gimme gimme