Git branches

NH
Norbert Hartl <norbert@hartl.name>
Wed, Feb 5, 2020 12:28 PM

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at?

thanks,

Norbert

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at? thanks, Norbert
MZ
Miroslav Zaric <miroslavzaric@uns.ac.rs>
Fri, Feb 7, 2020 9:16 AM

Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. Master should (ideally) only have merges from different development branches.

Best regards, Miroslav

On 5 Feb 2020, at 13:28, Norbert Hartl norbert@hartl.name wrote:

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at?

thanks,

Norbert

Workflow-engine mailing list Workflow-engine@lists.pharo.org http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org

Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. Master should (ideally) only have merges from different development branches. Best regards, Miroslav > On 5 Feb 2020, at 13:28, Norbert Hartl <norbert@hartl.name> wrote: > > I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at? > > thanks, > > Norbert > -- > Workflow-engine mailing list > Workflow-engine@lists.pharo.org > http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org
NH
Norbert Hartl <norbert@hartl.name>
Fri, Feb 7, 2020 9:28 AM

I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side.

Norbert

Am 07.02.2020 um 10:16 schrieb Miroslav Zaric miroslavzaric@uns.ac.rs:

Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. Master should (ideally) only have merges from different development branches.

Best regards, Miroslav

On 5 Feb 2020, at 13:28, Norbert Hartl norbert@hartl.name wrote:

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at?

thanks,

Norbert

Workflow-engine mailing list Workflow-engine@lists.pharo.org http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org

I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side. Norbert > Am 07.02.2020 um 10:16 schrieb Miroslav Zaric <miroslavzaric@uns.ac.rs>: > > Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. > Master should (ideally) only have merges from different development branches. > > Best regards, > Miroslav > >> On 5 Feb 2020, at 13:28, Norbert Hartl <norbert@hartl.name> wrote: >> >> I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at? >> >> thanks, >> >> Norbert >> -- >> Workflow-engine mailing list >> Workflow-engine@lists.pharo.org >> http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org > > > -- > Workflow-engine mailing list > Workflow-engine@lists.pharo.org > http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org
GM
Gordana Milosavljevic <grist@uns.ac.rs>
Fri, Feb 7, 2020 9:40 AM

Yes, we are also trying to archive this with students, but they are often shy to share their code until they are sure it's OK.

Gordana

On 2/7/2020 10:28 AM, Norbert Hartl wrote:

I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side.

Norbert

Am 07.02.2020 um 10:16 schrieb Miroslav Zaric miroslavzaric@uns.ac.rs:

Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. Master should (ideally) only have merges from different development branches.

Best regards, Miroslav

On 5 Feb 2020, at 13:28, Norbert Hartl norbert@hartl.name wrote:

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at?

thanks,

Norbert

Workflow-engine mailing list Workflow-engine@lists.pharo.org http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org

-- dr Gordana Milosavljevic, Associate Professor, Computing and Control Department, Faculty of Tecnical Sciences, University of Novi Sad, Serbia, www.informatika.ftn.uns.ac.rs

Yes, we are also trying to archive this with students, but they are often shy to share their code until they are sure it's OK. Gordana On 2/7/2020 10:28 AM, Norbert Hartl wrote: > I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side. > > Norbert > >> Am 07.02.2020 um 10:16 schrieb Miroslav Zaric <miroslavzaric@uns.ac.rs>: >> >> Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. >> Master should (ideally) only have merges from different development branches. >> >> Best regards, >> Miroslav >> >>> On 5 Feb 2020, at 13:28, Norbert Hartl <norbert@hartl.name> wrote: >>> >>> I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at? >>> >>> thanks, >>> >>> Norbert >>> -- >>> Workflow-engine mailing list >>> Workflow-engine@lists.pharo.org >>> http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org >> >> -- >> Workflow-engine mailing list >> Workflow-engine@lists.pharo.org >> http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org > -- dr Gordana Milosavljevic, Associate Professor, Computing and Control Department, Faculty of Tecnical Sciences, University of Novi Sad, Serbia, www.informatika.ftn.uns.ac.rs
NH
Norbert Hartl <norbert@hartl.name>
Fri, Feb 7, 2020 9:46 AM

That is normal :)  "I want to make it public only when it is ready AND perfect. Everything else will be embarasssing!". They should learn it is a great opportunity to get help from others. It is something they have to learn besides how to engineer a software.

Norbert

Am 07.02.2020 um 10:40 schrieb Gordana Milosavljevic grist@uns.ac.rs:

Yes, we are also trying to archive this with students, but they are often shy to share their code until they are sure it's OK.

Gordana

On 2/7/2020 10:28 AM, Norbert Hartl wrote:

I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side.

Norbert

Am 07.02.2020 um 10:16 schrieb Miroslav Zaric miroslavzaric@uns.ac.rs:

Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. Master should (ideally) only have merges from different development branches.

Best regards, Miroslav

On 5 Feb 2020, at 13:28, Norbert Hartl norbert@hartl.name wrote:

I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at?

thanks,

Norbert

Workflow-engine mailing list Workflow-engine@lists.pharo.org http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org

-- dr Gordana Milosavljevic, Associate Professor, Computing and Control Department, Faculty of Tecnical Sciences, University of Novi Sad, Serbia, www.informatika.ftn.uns.ac.rs

-- Workflow-engine mailing list Workflow-engine@lists.pharo.org http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org

That is normal :) "I want to make it public only when it is ready AND perfect. Everything else will be embarasssing!". They should learn it is a great opportunity to get help from others. It is something they have to learn besides how to engineer a software. Norbert > Am 07.02.2020 um 10:40 schrieb Gordana Milosavljevic <grist@uns.ac.rs>: > > Yes, we are also trying to archive this with students, but they are often shy to share their code until they are sure it's OK. > > Gordana > > On 2/7/2020 10:28 AM, Norbert Hartl wrote: >> I agree. We usually use the model that you create a feature branch for your work. When you are ready to share you create a pull request for everyone else to review. If you create the branch within the skaplar repository (or move the repo to a better place) it is even possible to work together on the pull request until there is agreement to merge on master. The travis configuration in place is in a way that it builds all pull requests so there is feedback if the pull requests builds green and is worth merging on master. This keeps master always on the stable side. >> >> Norbert >> >>> Am 07.02.2020 um 10:16 schrieb Miroslav Zaric <miroslavzaric@uns.ac.rs>: >>> >>> Just a suggestion for all involved, nad Sebastijan could force it on the repo, it would probably be good to stick to the „no commits on master" rule. >>> Master should (ideally) only have merges from different development branches. >>> >>> Best regards, >>> Miroslav >>> >>>> On 5 Feb 2020, at 13:28, Norbert Hartl <norbert@hartl.name> wrote: >>>> >>>> I try to look at the code but I wonder that master commits are newer than the development branch that was used before. Can you explain what I should use/look at? >>>> >>>> thanks, >>>> >>>> Norbert >>>> -- >>>> Workflow-engine mailing list >>>> Workflow-engine@lists.pharo.org >>>> http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org >>> >>> -- >>> Workflow-engine mailing list >>> Workflow-engine@lists.pharo.org >>> http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org >> > -- > dr Gordana Milosavljevic, > Associate Professor, > Computing and Control Department, > Faculty of Tecnical Sciences, > University of Novi Sad, Serbia, > www.informatika.ftn.uns.ac.rs > > > -- > Workflow-engine mailing list > Workflow-engine@lists.pharo.org > http://lists.pharo.org/mailman/listinfo/workflow-engine_lists.pharo.org