Wireshark · Wireshark-dev: Re: [Wireshark-dev] git doesn't like me anymore

[Dario Lombardo <lomato@xxxxxxxxx>]

Hi Fulko

Git can look really confusing at the beginning especially for people with long time experience on other code revision systems such as SVN (as it was for me).

There are 2 things to take into account.

The first one is git itself. That includes commands such as commit, push, pull, remote etc. That's the most technical part. There are a bunch of online crash courses you can find. I'd suggest code school's. It is short and has 2 parts: basic and advanced. You should watch the videos from both, since advanced is not really out-of-scope.

The second one is the so-called "fork workflow". This is the workflow that is used on github, gitlab, bitbucket and so on that is the popular model in which people fork (aka create a copy) of a public repo, make changes on their repo (so-called downstream) and then request a merge (merge request or pull request) on the original repo (so-called upstream). You can find a bunch of tutorials on this workflow, like https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow. This is less technical than the above point but is much more logical: if you don't understand the workflow, you will get lost. If you read a manual of "straight git" you will get lost.

My personal experience: steep learning curve, then a lot satisfactory.

I Hope it helps.

Dario.

On Mon, Jan 18, 2021 at 12:44 AM Fulko Hew <fulko.hew@xxxxxxxxx> wrote:

The subject line says it all, but it doesn't say why.

git and I just don't seem to understand one another.

I've made a new dissector, and I went through the whole process

to clone the repo, add/change my stuff, resync it, and submit

my merge request.  Now the approver(s) asked for some changes,

and although I disagreed with the need for the last one, I've

now made that enhancement too, and want to commit it and have

it merged.

But now after doing the 'git commit -a', the instructions say

I need to do 'git push downstream HEAD', but that returns the

error messages:

fatal: 'downstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I'll admit, I don't understand git, let alone how to use it,

so I need help on what I need to do to get past this issue.

Thanks

Fulko

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe

--

Naima is online.