Re: [oi-dev] How do I update shared-macros.mk on github?
On Sat, Apr 08, 2017 at 10:30:59AM +0200, Adam Števko wrote: > > either create a new branch with new name from updated oi/hipster, > delete old branch with shared-macros.mk and recreate ir just force > push changes into the old branch (it will overwrite old commit with > new ones) I don't understand, but that seemed to work. The push to my clone counted 13,000 objects. That was frightening! I expected to find the PR full of commits, but there was only one, and it was the one I wanted. -- -Gary Mills--refurb--Winnipeg, Manitoba, Canada- ___ oi-dev mailing list oi-dev@openindiana.org https://openindiana.org/mailman/listinfo/oi-dev
Re: [oi-dev] How do I update shared-macros.mk on github?
Hey, either create a new branch with new name from updated oi/hipster, delete old branch with shared-macros.mk and recreate ir just force push changes into the old branch (it will overwrite old commit with new ones) Adam > On 8 Apr 2017, at 03:55, Gary Mills wrote: > > What is the trick to updating shared-macros.mk in oi-userland on > github? I thought I knew how to do it, but it didn't work. > > I have a fork of oi-userland on github that I made in November and a > local clone of the fork that I made just afterwards. Recently, I > modified shared-macros.mk locally, did a commit in a new branch, and > did a push of that branch to my fork on github. Then, I created a PR > for that change; it was integrated into oi-userland. So far, > everything worked nicely. > > Now I need to make another change to shared-macros.mk. I kept copies > of the original file and the file after the first change. This time, > when I did a push to my fork on github, the commit there contained > both changes. Consequently, the PR doesn't work because of conflicts. > I was expecting it to contain only the second change. > > What can I do now to make it work? > > > -- > -Gary Mills--refurb--Winnipeg, Manitoba, Canada- > > ___ > oi-dev mailing list > oi-dev@openindiana.org > https://openindiana.org/mailman/listinfo/oi-dev ___ oi-dev mailing list oi-dev@openindiana.org https://openindiana.org/mailman/listinfo/oi-dev
[oi-dev] How do I update shared-macros.mk on github?
What is the trick to updating shared-macros.mk in oi-userland on github? I thought I knew how to do it, but it didn't work. I have a fork of oi-userland on github that I made in November and a local clone of the fork that I made just afterwards. Recently, I modified shared-macros.mk locally, did a commit in a new branch, and did a push of that branch to my fork on github. Then, I created a PR for that change; it was integrated into oi-userland. So far, everything worked nicely. Now I need to make another change to shared-macros.mk. I kept copies of the original file and the file after the first change. This time, when I did a push to my fork on github, the commit there contained both changes. Consequently, the PR doesn't work because of conflicts. I was expecting it to contain only the second change. What can I do now to make it work? -- -Gary Mills--refurb--Winnipeg, Manitoba, Canada- ___ oi-dev mailing list oi-dev@openindiana.org https://openindiana.org/mailman/listinfo/oi-dev
