Hi Pieter You did everything right expect one thing. Never commit to the devel branch, create a new branch from the devel branch and commit to this.
Since you already commited to the devel branch just do the following: # make sure you are on the devel branch first git checkout devel # branch off the devel branch git checkout -b feature/xyz git push origin feature/xyz In your case you now have all the commits in the new branch, not reset the devel branch to the state of the upstream devel git checkout devel git reset --hard upstream:devel your devel branch has now the state of the upstreams devel again Regards René On 01/25/2017 10:52 AM, Pieter Voet wrote: > btw. my pull request is #19007 > > Op woensdag 25 januari 2017 10:46:44 UTC+1 schreef Pieter Voet: > > Hi all, > > I'm not sure if my actions on my pull request were correct... > Hopefully someone can comment on it.. > > Using the Github web interface, I forked > 'https://github.com/ansible/ansible > <https://github.com/ansible/ansible>'. I used that same interface to > edit and add files, and comitted to my fork. Apparently that branch > is called 'devel' since the fork was > done from the Ansible 'devel' branch. From there I issued a pull > request. > > Recently Ansibot mentioned that I should rebase, which is obviously > no surprise after a while. > I could not find a way to use the web interface to do that, so I > used the commandline interface on my > Linux laptop : > > $ git clone https://github.com/PieterVoet/ansible.git > <https://github.com/PieterVoet/ansible.git> > $ cd ansible > $ remote add upstream https://github.com/ansible/ansible.git > <https://github.com/ansible/ansible.git> > > initially I used > > $ git fetch upstream devel > $ git rebase -i upstream/devel > > rename all but first 'pick' to 'squash' > save > > $ git commit > $ git push -f origin devel > > but the web interface for my pull request did not show the commits, > and the status still remained 'needs rebase'. > After some days, I tried : > > > $ git pull upstream devel --rebase > $ git push origin HEAD:devel > $ git pull upstream devel --rebase > > now I got some messages about confilcts, so I edited my files and saved > > $ vi lib/ansible/plugins/strategy/__init__.py > $ vi lib/ansible/modules/utilities/logic/set_extra_var.py > $ git add lib/ansible/modules/utilities/logic/set_extra_var.py > $ git add lib/ansible/plugins/strategy/__init__.py > $ git commit > $ git push origin HEAD:devel > > I now can see the commits in the web interface, but it now also says : > > 'wants to merge 367 commits into ansible:devel from PieterVoet:devel' > > Oww.. now I get confused... I did not expect the commits that I got > from the rebase to be commits > for my own pull request.. Maybe I really messed up... > > Can someone please verify my steps and check if I did someting wrong > ? If so, what should > I do to correct ? > Thanks in advance for any help . > > -- > You received this message because you are subscribed to the Google > Groups "Ansible Development" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to [email protected] > <mailto:[email protected]>. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "Ansible Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
