astrobee
astrobee copied to clipboard
nasa
Diff for comparison with upstream
It's usually better to target PRs against develop.
Yeah, I have no intention of actually merging this, I just wanted a pretty diff against the current master release
It's usually better to target PRs against develop.
Yeah, I have no intention of actually merging this, I just wanted a pretty diff against the current master release
Ok sorry if I'm missing something here, just trying to help.
I think the plan for deploying your changes is to merge your branch into develop, then merge develop into master. Right now develop is 19 commits ahead of master. So you probably want to make sure develop is merged into your branch, and then the most helpful nice diff to look at would be between develop and your branch. But feel free to forget all this if you have some other arrangement with @marinagmoreira.
It's usually better to target PRs against develop.
Yeah, I have no intention of actually merging this, I just wanted a pretty diff against the current master release
Ok sorry if I'm missing something here, just trying to help.
I think the plan for deploying your changes is to merge your branch into develop, then merge develop into master. Right now develop is 19 commits ahead of master. So you probably want to make sure develop is merged into your branch, and then the most helpful nice diff to look at would be between develop and your branch. But feel free to forget all this if you have some other arrangement with @marinagmoreira.
Thank you Trey! This is actually somewhat different from what I had in mind. I thought we didn't want to merge my stuff into the main repo, so instead I have merged the latest release (hence master) into my own branch, from which I am building a release and compiling relevant debians, etc. I'm fine with either approach, just depends on whether you want my stuff in the main repo or not.
I think this is still the right approach to not merge unless there are some specific things we want. Btw it might be less confusing for others if you make a pull request from our master to your branch so you can still see the diff but the pull request is only visible to you.
