black market income

changed the description

Should be straightforward. You up for learning how to do a commit yourself? Teach a guy to fish and all that.

Create an MR?

That's a part of it. Let us know where you get stuck.

Update your local copy of pregmod-master. Make a branch from it. Make your changes. Commit them locally. Push them to the internet. Make a merge request.

Update your local copy of pregmod-master. Done

Make a branch from it. Stuck here

Make your changes.

Commit them locally.

Push them to the internet.

Make a merge request.

Do you have a git client installed locally? Gitgud is seemingly unable to update forks.
I'll echo LCD and say the whole process is very straight forward.

Just only got the hang of the git gui I have.

Just only got the hang of the git gui I have.

If I can make a suggestion, install and use the command line version. Most of the commands should be identical between different OS's.

Make a branch from it. Stuck here

git checkout -qb branchName

-q, --quiet
           Quiet, suppress feedback messages.
-b <new_branch>
           Create a new branch named <new_branch> and start it at <start_point>; see git-branch(1) for details.

Make your changes.

use [editor of choice] to edit files as desired.

Commit them locally.

If only modifying an existing file in place git commit -qam 'Message' will work. <br>If adding/removing/moving files git add *thengit commit -qm 'Message'` is more useful.

-q, --quiet
           Quiet, suppress feedback messages.
-m <msg>, --message=<msg>
           Use the given <msg> as the commit message. If multiple -m options are given, their values are concatenated as separate paragraphs.

           The -m option is mutually exclusive with -c, -C, and -F.
-a, --all
           Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.

Push them to the internet.

I would suggest enabling a SSH key however there are other options. Then simply do git push -q. The first time it will likely spit back an error with a clearly provided solution.

Make a merge request.

Gitgud GUI. Project overview/[Your fork] -> Repository -> Branches.
There should be a blue prompt near to the top to make a Merge Request/Merge Request option inline with your target branch.
Either will by default target upstream's pregmod-master.

Hopefully this is useful.

The gui comes with a git bash cmd so I use it.

Ugh this new branch contains all my mods, how throw out the mods?

I would suggest keeping this new branch then changing your branch back to pregmod-master git checkout -q pregmod-master along with possibly renaming it (git branch -m branchName newBranchName) and then fetching upstream, roll back a commit (mainly if the branch is already in-sync with upstream, git reset --hard HEAD~1), following by merging in upstream with the -s theirs flag (git merge -Xtheirs upstream/pregmod-master` which should ideally replace any differing files with upstream.

I call it upstreamod, which sounds like its purpose.

checkout new branch then reset it?

I have 4 branches on my gitgud profile

the local pregmod-master - cannot be modded

minetest - abandoned mod branch

minetestmod - mod branch

upstreammod - to suggest changes to pregmod

Rather than having one branch for alll of your work going here, each MR should probably have it's own branch. Branches are basically free, not reason not to have a lot of them.

So for naming, you probably want to go for something specific to what you are fixing. The title of this post, for example, "black market income". Or I suppose that would be black-market-income. Then when you are done with it you can throw it away.

Next time you want to fix something, start a fresh branch. One branch for each MR.

made new branch bmincome, its not in the gitgud profile yet, and need it to have fresh files.

for fresh files, I believe you can just do git pull upstream pregmod-master. Upstream here clarifies that you want to update from the version of pregmod-master that everyone else is looking at, the one that is here. Not your own fork.

fresh files done. the new branch is not on my gitgud profile?

You will need to push it. Pushing it means "send it to the cloud." Try git push and see what it says.

$ git push fatal: The upstream branch of your current branch does not match the name of your current branch. To push to the upstream branch on the remote, use

git push origin HEAD:upstreammod

To push to the branch of the same name on the remote, use

git push origin HEAD

To choose either option permanently, see push.default in 'git help config'.

Must have goofed somewhere....

Doing it by console adds complexity when starting, but we're down that road already and it's good to know how it works.

Do the second one for now.

done. it still picks up all the modded files[I add simplistic comments on modded files] instead of a fresh from pregmod-master.... do a hard reset?

Yup! Hard reset as described above.

Then you will need to do a "force push" to overwrite what is on the server. Force means throw away what's there and replace it with a perfect copy of what you are sending. git push -f.

Then you will need to do your change again. Sorry. At least it's simple!

ere wait its only reset just that branch right? I still want my mod branch.

Good to be safe!

git reset --hard upstream/pregmod-master

This means take the currently checked out branch, and force to be exactly like upstream/pregmod-master. It won't have more or less stuff.

It will not touch any other branches, only the one that is checked out.

edit: you can always do git status to make sure what is checked out.

you can always do git status to make sure what is checked out.

Mainly for additional info:
git branch --list can also do the same task, the current branch's name will bold and be preceded by *.
e.g.

git branch --list
  pregmod-master
* test

On branch bmincome so reset here.

$ git reset --hard upstream/pregmod-master HEAD is now at 5f70f87e Merge branch 'protect-game-state-if-bc-breaks' into 'pregmod-master'

$ git push -f fatal: The upstream branch of your current branch does not match the name of your current branch. To push to the upstream branch on the remote, use

git push origin HEAD:upstreammod

To push to the branch of the same name on the remote, use

git push origin HEAD

To choose either option permanently, see push.default in 'git help config'.

goofed again....

No, it's the same error as before. Maybe blank has some insight on how to set up the branch correctly locally.

For now, git push -f origin HEAD. Just adding f for force.

!6490 (merged)

I hope thats right, checked the delete source option.

I usually check it as well. Wish it was the default.

edit: looks pretty good to me!

I agree with LCD on both accounts. On a personal note, I enable Squash commits when merge request is accepted. as to some what tidy.

"Squash commits" is a good idea if you've thrashed a lot on the patch or have useless commit messages, but a bad idea if you have made distinct commits with useful commit messages.

Long-term, it's a better idea to make distinct commits with useful commit messages...it makes log and blame far more useful.

And git rebase -i and git commit --amend are nice if you're thrashing.

Be careful with commit --amend if you're in the habit of pushing every time you commit (which I am). If you amend a commit locally that's already been pushed, git will conflict-lock and you'll have to either force push or force pull.

Yup, same exact thing happens to me XD. Not too bad if you're the only one working on the branch though, right?

I usually check it as well. Wish it was the default.

"Good news everyone".
[Repo] -> Settings -> General -> Merge requests -> Merge options

Enable 'Delete source branch' option by default Existing merge requests and protected branches are not affected

Also enabling "Automatically resolve merge request diff discussions when they become outdated" probably would not hurt.

@Pregmodder @pregmodfan
If I am reading the permissions table right you should both be able to change the above settings.

Are those 2 different people or same person?

Different. You'll see the URL at the top makes this fan's fork, but he's not very active any more.

@Blank_Alt did you get your old acc back? Theres activity on the faq project.

@ZZC
Not so far and it seems that the shitcord is the only viable option. I still have SSH access through which is useful.
As per your question, I am not sure.

closed

black market income

Designs

Child items ...

Activity