Re: [sumo-dev] Problems with git code contribution

[Harald Schaefer]

Hello Jakob,

yesterday I tried to create a second fork under the same git-account, 
but I ended up in the old one.


You should describe in 
https://sumo.dlr.de/docs/FAQ.html#how_can_i_contribute_to_sumo how to 
make a second fork and contribution.


Hope you can use the data of pull request 6841.

Best regards, Harald


Am 27.03.20 um 13:15 schrieb Jakob Erdmann:

Hello Harald,
I recommend creating a new fork for every pull request. Think of it 
like a feature branch that is closed once the feature is merged.

best regards,
Jakob

Am Fr., 27. März 2020 um 12:17 Uhr schrieb Harald Schaefer 
mailto:fechs...@gmail.com>>:


Hi,

once upon a time I had successfully committed a change proposal.

Now I want to propose a second change.

My idea was to

  * use the old fork,
  * update it to the newest version (following

https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)
  * make new changes
  * commit them and
  * make a pull request.

Now the merge failed, because my old pull request was slightly
modified.

What is the recommended procedure?

  * Create a new fork for every commit or
  * try to keep one fork in sync with the opstream

Best regards, Harald


___
sumo-dev mailing list
sumo-dev@eclipse.org 
To unsubscribe from this list, visit
https://www.eclipse.org/mailman/listinfo/sumo-dev


___
sumo-dev mailing list
sumo-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/sumo-dev
___
sumo-dev mailing list
sumo-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/sumo-dev

Re: [sumo-dev] Problems with git code contribution

[Jakob Erdmann]

Hello Harald,
I recommend creating a new fork for every pull request. Think of it like a
feature branch that is closed once the feature is merged.
best regards,
Jakob

Am Fr., 27. März 2020 um 12:17 Uhr schrieb Harald Schaefer <
fechs...@gmail.com>:

> Hi,
>
> once upon a time I had successfully committed a change proposal.
>
> Now I want to propose a second change.
>
> My idea was to
>
>- use the old fork,
>- update it to the newest version (following
>
> https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork
>)
>- make new changes
>- commit them and
>- make a pull request.
>
> Now the merge failed, because my old pull request was slightly modified.
>
> What is the recommended procedure?
>
>- Create a new fork for every commit or
>- try to keep one fork in sync with the opstream
>
> Best regards, Harald
>
>
> ___
> sumo-dev mailing list
> sumo-dev@eclipse.org
> To unsubscribe from this list, visit
> https://www.eclipse.org/mailman/listinfo/sumo-dev
>
___
sumo-dev mailing list
sumo-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/sumo-dev

[sumo-dev] Problems with git code contribution

[Harald Schaefer]

Hi,

once upon a time I had successfully committed a change proposal.

Now I want to propose a second change.

My idea was to

 * use the old fork,
 * update it to the newest version (following
   
https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)
 * make new changes
 * commit them and
 * make a pull request.

Now the merge failed, because my old pull request was slightly modified.

What is the recommended procedure?

 * Create a new fork for every commit or
 * try to keep one fork in sync with the opstream

Best regards, Harald


___
sumo-dev mailing list
sumo-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/sumo-dev