What are your git questions?

SD
stephane ducasse
Sat, Jul 8, 2023 3:03 PM

Hi

At ESUG Guillermo and Pablo will run a special talk around git.
The idea is to reply to your concrete git questions.

You can reply to this mail or keep them and we will collect them during
the first days of the conference.

Here are some examples of a question.

- How can I make sure that a branch on which I’m still working will not produce noise
with the new version of master that came out?

- I depend on projects that are in development but I do not want to be exposed to their 
bugs, how can they configure their system?

- I pushed some changes I did not want. How can I revert them and keep the others?

S

Hi At ESUG Guillermo and Pablo will run a special talk around git. The idea is to reply to your concrete git questions. You can reply to this mail or keep them and we will collect them during the first days of the conference. Here are some examples of a question. - How can I make sure that a branch on which I’m still working will not produce noise with the new version of master that came out? - I depend on projects that are in development but I do not want to be exposed to their bugs, how can they configure their system? - I pushed some changes I did not want. How can I revert them and keep the others? S
NB
Noury Bouraqadi
Mon, Jul 10, 2023 1:23 PM

How can I make a symbolic link to a branch?
Examples of symbolic links would be : latest-stable, development.
For example in PharoJS, latest-stable would point to pharo10 branch now, and development points to pharo11 branch.
But, once all tests become green for the pharo11 branch, we'll change so:
latest-stable -> pharo11
develpment -> pharo12

Noury
On Jul 8 2023, at 5:03 pm, stephane ducasse stephane.ducasse@inria.fr wrote:

Hi

At ESUG Guillermo and Pablo will run a special talk around git.
The idea is to reply to your concrete git questions.

You can reply to this mail or keep them and we will collect them during
the first days of the conference.

Here are some examples of a question.

  • How can I make sure that a branch on which I’m still working will not produce noise
    with the new version of master that came out?

  • I depend on projects that are in development but I do not want to be exposed to their
    bugs, how can they configure their system?

  • I pushed some changes I did not want. How can I revert them and keep the others?
    S


Esug-list mailing list -- esug-list@lists.esug.org
To unsubscribe send an email to esug-list-leave@lists.esug.org

How can I make a symbolic link to a branch? Examples of symbolic links would be : latest-stable, development. For example in PharoJS, latest-stable would point to pharo10 branch now, and development points to pharo11 branch. But, once all tests become green for the pharo11 branch, we'll change so: latest-stable -> pharo11 develpment -> pharo12 Noury On Jul 8 2023, at 5:03 pm, stephane ducasse <stephane.ducasse@inria.fr> wrote: > Hi > > At ESUG Guillermo and Pablo will run a special talk around git. > The idea is to reply to your concrete git questions. > > You can reply to this mail or keep them and we will collect them during > the first days of the conference. > > Here are some examples of a question. > - How can I make sure that a branch on which I’m still working will not produce noise > with the new version of master that came out? > > - I depend on projects that are in development but I do not want to be exposed to their > bugs, how can they configure their system? > > - I pushed some changes I did not want. How can I revert them and keep the others? > S > _______________________________________________ > Esug-list mailing list -- esug-list@lists.esug.org > To unsubscribe send an email to esug-list-leave@lists.esug.org >
NH
Norbert Hartl
Tue, Jul 18, 2023 9:24 AM

My usual way of work is to make a branch for a new change. After merging that branch I would want to change to the main branch without unloading the changes I did, fetch main and reload the changes again. Is there a way to go onto the actual main branch which is then the same as my current branch?

Norbert

Am 08.07.2023 um 17:03 schrieb stephane ducasse stephane.ducasse@inria.fr:

Hi

At ESUG Guillermo and Pablo will run a special talk around git.
The idea is to reply to your concrete git questions.

You can reply to this mail or keep them and we will collect them during
the first days of the conference.

Here are some examples of a question.

- How can I make sure that a branch on which I’m still working will not produce noise
with the new version of master that came out?

- I depend on projects that are in development but I do not want to be exposed to their 
bugs, how can they configure their system?

- I pushed some changes I did not want. How can I revert them and keep the others?

S


Esug-list mailing list -- esug-list@lists.esug.org
To unsubscribe send an email to esug-list-leave@lists.esug.org

My usual way of work is to make a branch for a new change. After merging that branch I would want to change to the main branch without unloading the changes I did, fetch main and reload the changes again. Is there a way to go onto the actual main branch which is then the same as my current branch? Norbert > Am 08.07.2023 um 17:03 schrieb stephane ducasse <stephane.ducasse@inria.fr>: > > Hi > > At ESUG Guillermo and Pablo will run a special talk around git. > The idea is to reply to your concrete git questions. > > You can reply to this mail or keep them and we will collect them during > the first days of the conference. > > Here are some examples of a question. > > - How can I make sure that a branch on which I’m still working will not produce noise > with the new version of master that came out? > > - I depend on projects that are in development but I do not want to be exposed to their > bugs, how can they configure their system? > > - I pushed some changes I did not want. How can I revert them and keep the others? > > S > _______________________________________________ > Esug-list mailing list -- esug-list@lists.esug.org > To unsubscribe send an email to esug-list-leave@lists.esug.org
SD
stephane ducasse
Wed, Aug 2, 2023 7:51 AM

Here is another question

  • How do I fix a conflict of a PR when the master evolves in between?
    I should be able to continue to publish new changes in my PR but loading it may remove changes
    that are important and break the system. So I know that I should use "do not load the package"
    but having a systematic process and documented workflow would really help avoid mistakes.

S

On 8 Jul 2023, at 17:03, stephane ducasse stephane.ducasse@inria.fr wrote:

Hi

At ESUG Guillermo and Pablo will run a special talk around git.
The idea is to reply to your concrete git questions.

You can reply to this mail or keep them and we will collect them during
the first days of the conference.

Here are some examples of a question.

- How can I make sure that a branch on which I’m still working will not produce noise
with the new version of master that came out?

- I depend on projects that are in development but I do not want to be exposed to their 
bugs, how can they configure their system?

- I pushed some changes I did not want. How can I revert them and keep the others?

S


Esug-list mailing list -- esug-list@lists.esug.org
To unsubscribe send an email to esug-list-leave@lists.esug.org

Here is another question - How do I fix a conflict of a PR when the master evolves in between? I should be able to continue to publish new changes in my PR but loading it may remove changes that are important and break the system. So I know that I should use "do not load the package" but having a systematic process and documented workflow would really help avoid mistakes. S > On 8 Jul 2023, at 17:03, stephane ducasse <stephane.ducasse@inria.fr> wrote: > > Hi > > At ESUG Guillermo and Pablo will run a special talk around git. > The idea is to reply to your concrete git questions. > > You can reply to this mail or keep them and we will collect them during > the first days of the conference. > > Here are some examples of a question. > > - How can I make sure that a branch on which I’m still working will not produce noise > with the new version of master that came out? > > - I depend on projects that are in development but I do not want to be exposed to their > bugs, how can they configure their system? > > - I pushed some changes I did not want. How can I revert them and keep the others? > > S > _______________________________________________ > Esug-list mailing list -- esug-list@lists.esug.org > To unsubscribe send an email to esug-list-leave@lists.esug.org
S0
squeak.00@klix.ch
Wed, Aug 2, 2023 10:02 AM

How can I replace git with mercurial?

Best Regards,

Gerald

On 7/8/23 5:03 PM, stephane ducasse wrote:

Hi

At ESUG Guillermo and Pablo will run a special talk around git.
The idea is to reply to your concrete git questions.

You can reply to this mail or keep them and we will collect them during
the first days of the conference.

Here are some examples of a question.

- How can I make sure that a branch on which I’m still working will not produce noise
with the new version of master that came out?

- I depend on projects that are in development but I do not want to be exposed to their
bugs, how can they configure their system?

- I pushed some changes I did not want. How can I revert them and keep the others?

S


Esug-list mailing list -- esug-list@lists.esug.org
To unsubscribe send an email to esug-list-leave@lists.esug.org

How can I replace git with mercurial? Best Regards, Gerald On 7/8/23 5:03 PM, stephane ducasse wrote: > Hi > > At ESUG Guillermo and Pablo will run a special talk around git. > The idea is to reply to your concrete git questions. > > You can reply to this mail or keep them and we will collect them during > the first days of the conference. > > Here are some examples of a question. > > - How can I make sure that a branch on which I’m still working will not produce noise > with the new version of master that came out? > > - I depend on projects that are in development but I do not want to be exposed to their > bugs, how can they configure their system? > > - I pushed some changes I did not want. How can I revert them and keep the others? > > S > _______________________________________________ > Esug-list mailing list -- esug-list@lists.esug.org > To unsubscribe send an email to esug-list-leave@lists.esug.org