9 ms·

Me too. That's awesome: I've just suggested it to our team. Thanks for sharing GP! One serious question though: how do you deal with PRs when you do this? That

Me too. That's awesome: I've just suggested it to our team. Thanks for sharing GP! One serious question though: how do you deal with PRs when you do this? That's one area where it feels like things could be quite messy, especially if you have quite a few PRs going in throughout the day.

u801e 7y ago
Pull requests could be done through email using the git format-patch, git send-email, and git am commands.
pmontra 7y ago
You could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.
mikepurvis 7y ago
There have been various proposals over the years for how to integrate issues and reviews in the distributed git tree itself (http://dist-bugs.branchable.com/software/ http://dist-bugs.branchable.com/software/), but I don't think any of them have really gone anywhere, certainly not in terms of support by the hosted git vendors. Having looked briefly into it now, git-dit does look promising in its approach. I'd be interested to hear from someone who had actually used it and bumped up against the limitations: https://github.com/neithernut/git-dit/blob/master/doc/datamodel.md https://github.com/neithernut/git-dit/blob/master/doc/datamo...
- MayeulC 7y ago
  There is git-appraise to fill that gap [1]. I am personally waiting for a federated "forge" for federating PRs across platforms, such as the one developed in [2]. Maybe via e-mail? [3]. [1]: https://github.com/google/git-appraise https://github.com/google/git-appraise [2]: https://github.com/forgefed/forgefed https://github.com/forgefed/forgefed [3]: https://drewdevault.com/2018/07/23/Git-is-already-distributed.html https://drewdevault.com/2018/07/23/Git-is-already-distribute...
NikkiA 7y ago
Merge the PR on github, pull to your local copy (now you're ahead of one of the urls of origin), push (and it should just push to the origin that's behind) If you have any discrepencies in between them, you'll need to merge locally of course.

u801e 7y ago

Pull requests could be done through email using the git format-patch, git send-email, and git am commands.

pmontra 7y ago

You could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.

mikepurvis 7y ago

There have been various proposals over the years for how to integrate issues and reviews in the distributed git tree itself (http://dist-bugs.branchable.com/software/ http://dist-bugs.branchable.com/software/), but I don't think any of them have really gone anywhere, certainly not in terms of support by the hosted git vendors. Having looked briefly into it now, git-dit does look promising in its approach. I'd be interested to hear from someone who had actually used it and bumped up against the limitations: https://github.com/neithernut/git-dit/blob/master/doc/datamodel.md https://github.com/neithernut/git-dit/blob/master/doc/datamo...

MayeulC 7y ago
There is git-appraise to fill that gap [1]. I am personally waiting for a federated "forge" for federating PRs across platforms, such as the one developed in [2]. Maybe via e-mail? [3]. [1]: https://github.com/google/git-appraise https://github.com/google/git-appraise [2]: https://github.com/forgefed/forgefed https://github.com/forgefed/forgefed [3]: https://drewdevault.com/2018/07/23/Git-is-already-distributed.html https://drewdevault.com/2018/07/23/Git-is-already-distribute...

NikkiA 7y ago

Merge the PR on github, pull to your local copy (now you're ahead of one of the urls of origin), push (and it should just push to the origin that's behind) If you have any discrepencies in between them, you'll need to merge locally of course.