search

wf49670 / ppgen

Post-processing generator for DP
6 stars 4 forks source link

resync Develop from rfrank #35

Closed wf49670 closed 10 years ago

ghost commented 10 years ago

Walt, you closed this. I still need to merge it, right?

ghost commented 10 years ago

Yeah, looking at it more, I see you made changes that aren't in develop. Worthwhile changes. I sense that something went wrong related to how I am using Git. When I checked out develop this morning here at the motel and made changes and then committed and 'git push origin develop' did that somehow trash all your changes? Or were they there waiting to be merged and I didn't know about it? But when you closed this ticket, are those changes no longer something I can make (assuming you still want them made)? Still confused, but this time in Omaha instead of Denver. I'm not any smarter at lower altitudes.

wf49670 commented 10 years ago

I had some changes in my develop branch that I didn't want you to have to worry about while you were traveling. Then when you made your .na changes this morning I tried to do a pull from your develop into mine, so I'd have them, but for some reason I ended up with a pull going the other way. I knew that one wouldn't work, so I closed it, then (from my PC) I did a fetch upstream, merged your changes into my local PC copy, then re-pushed to my github develop.

Feel free to reopen this pull request (the title is not great, at this point), and if it says it will merge without conflict then it should be good to go. If it complains, though, I will create a new one.

ghost commented 10 years ago

I guess develop has it all right now.

When you say "then re-pushed to my github develop" maybe that's where I'm confused. I thought there was just one "github develop" with multiple local repositories possible all called "develop" on our own computers. I thought that when someone other than me did a 'git push origin develop' that it created a merge request for me to pick up (at the project manager). I thought that when I did that same command it actually updated the one "develop" that's on github only because I am the project manager.

Anyway if you pull develop now and if it has the changes you hoped for, tell me and I can merge it with master.

wf49670 commented 10 years ago

On 10/17/2014 5:18 PM, rfrank wrote:

I guess develop has it all right now.

rfrank/ppgen develop looks like it has all my changes.

When you say "then re-pushed to my github develop" maybe that's where I'm confused. I thought there was just one "github develop" with multiple local repositories possible all called "develop" on our own computers. I thought that when someone other than me did a 'git push origin develop' that it created a merge request for me to pick up (at the project manager). I thought that when I did that same command it actually updated the one "develop" that's on github only because I am the project manager.

I had a local repository on my PC, cloned from rfrank/ppgen. However, if I made any changes to my local develop branch, committed them, and did a push the push would be into rfrank/ppgen. And that fails as only you have write access to your files on Github.

So I cloned rfrank/ppgn on Github (wf49670/ppgen), then I cloned that on my PC. I make changes to my local develop branch on the PC, then commit, then push to wf49670/ppgen develop, then create a Pull request for you to pull the code from wf49670/ppgen develop into rfrank/ppgen develop.

From the PC I can do a "fetch upstream" when you have changed rfrank/ppgen and that will get the changes in my local repository. I thought I also needed to pull them from rfrank/ppgen into wf49670/ppgen on Github, and I have successfully done that once. But this last time it failed, and I'm not sure quite why. And, perhaps it's not something I need to do. Perhaps simply doing the "fetch upstream" from the PC to get your changes and then a "push origin" to put them back into my Github is all I really need to do before creating the "pull" request for you.

Regards, Walt