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

2021-01-18 Thread Dario Lombardo
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

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

2021-01-17 Thread Guy Harris
On Jan 17, 2021, at 3:43 PM, Fulko Hew wrote: > fatal: 'downstream' does not appear to be a git repository > fatal: Could not read from remote repository. I don't call it "downstream" - as per the (bowderlized :-)) comment in my git-reviewbranch script, I think "upstream" and "downstream" do

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

2021-01-17 Thread Guy Harris
On Jan 17, 2021, at 3:43 PM, Fulko Hew 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'm not sure whether *anybody* truly understands Git. :-) See, for example: https://xkcd.com/1597/ (yes, I *have* used the

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

2021-01-17 Thread Guy Harris
On Jan 17, 2021, at 3:50 PM, ajay saxena wrote: > You should be able to add your changes to the existing branch by running the > following commands. These commands assume you are already on the branch using > which you created the PR. > > git add updateFileName > git commit -m "message" Note

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

2021-01-17 Thread Guy Harris
On Jan 17, 2021, at 4:35 PM, ajay saxena wrote: > Each time you make a change to a file, you need to stage it irrespective of > whether the file was present in an earlier commit and was "added" earlier. > The staging is done by the git command git add. A staged change needs to be > committed

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

2021-01-17 Thread ajay saxena
Each time you make a change to a file, you need to stage it irrespective of whether the file was present in an earlier commit and was "added" earlier. The staging is done by the git command git add. A staged change needs to be committed to create a commit out of it. So after you run git add, you

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

2021-01-17 Thread Fulko Hew
On Sun, Jan 17, 2021 at 6:50 PM ajay saxena wrote: > You should be able to add your changes to the existing branch by running > the following commands. These commands assume you are already on the branch > using which you created the PR. > > git add updateFileName > Since I only modified an

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

2021-01-17 Thread ajay saxena
You should be able to add your changes to the existing branch by running the following commands. These commands assume you are already on the branch using which you created the PR. git add updateFileName git commit -m "message" git push When you push the new commits to your fork that should help

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

2021-01-17 Thread Fulko Hew
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,