[pytest-dev] maintaining a synced git fork easily?

[Raphael Pierzina]

Hi!

I also follow the workflow that Florian and Bruno explained.

It pretty much resembles theses guides:
https://help.github.com/articles/configuring-a-remote-for-a-fork/ <https://help.github.com/articles/configuring-a-remote-for-a-fork/>
https://help.github.com/articles/syncing-a-fork/ <https://help.github.com/articles/syncing-a-fork/>

As to the ``push.default`` setting, I usually go with ``simple``. It is the default starting from Git version 2.0. I found the following SO answer helpful in addition to the official docs.
http://stackoverflow.com/a/13148313 <http://stackoverflow.com/a/13148313>

I always explicitly specify the remote repository for a ``fetch`` or ``push`` to not mess up accidentally. But this is totally up to your personal preference.

```bash
# Sync local repo and fork with original repo
$ git checkout master
$ git fetch upstream
$ git merge upstream/master
$ git push origin

# Create feature branch on master
$ git checkout -b add-awesome-feature
…

# Sync master again and rebase your local branch before pushing it
...
$ git rebase master
$ git push -u origin add-awesome-feature

# Submit a Pull Request. Sync master once the PR has been accepted
# I delete my remote feature branch via the GitHub UI and clean up branch my local branch afterwards
...
$ git fetch -p origin
$ git branch -d add-awesome-feature
```

Hope this helps!
Raphael

> On 28 Sep 2015, at 13:33, holger krekel <holger at merlinux.eu> wrote:
> 
> On Mon, Sep 28, 2015 at 11:15 +0000, Bruno Oliveira wrote:
>> On Mon, Sep 28, 2015 at 7:26 AM Florian Bruhin <me at the-compiler.org> wrote:
>> 
>>> I usually have the following workflow when I contribute to projects:
>>> 
>> 
>> I have the exact workflow as Florian. :)
>> 
>> I would only add that you can create your branches based directly on the
>> upstream:
>> 
>> $ git checkout -b fix-1234 upstream/master
>> $ git push origin
> 
> thanks.  The post Eldar referenced also advertises this workflow
> but additionally sets some config options:
> 
>    $ git config remote.pushdefault origin
>    $ git config push.default current
> 
> which means you can just say "git push" above.
> 
> I am trying out this work flow now.
> thanks everybody :)
> holger
> _______________________________________________
> pytest-dev mailing list
> pytest-dev at python.org
> https://mail.python.org/mailman/listinfo/pytest-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pytest-dev/attachments/20150928/e7c34c2f/attachment-0001.html>