[jetty-dev] Heads Up - Git branch changes!

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[jetty-dev] Heads Up - Git branch changes!

Joakim Erdfelt-8
The jetty-9.4.x branch has been replaced.

It has had all of its javax.websocket-1.1 changes removed.

If you have a local clone of jetty-9.4.x, you will encounter pull/merge issues.

To force your local jetty-9.4.x to be the same as the remote do this ...


$ git checkout jetty-9.4.x
$ git fetch origin
$ git reset --hard origin/jetty-9.4.x


Joakim Erdfelt / [hidden email]

_______________________________________________
jetty-dev mailing list
[hidden email]
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jetty-dev
Reply | Threaded
Open this post in threaded view
|

Re: [jetty-dev] Heads Up - Git branch changes!

Joakim Erdfelt-8
Note: you might have to follow up that with a clean of unstaged files/directories.

$ git clean -fd



Joakim Erdfelt / [hidden email]

On Wed, Aug 9, 2017 at 2:22 PM, Joakim Erdfelt <[hidden email]> wrote:
The jetty-9.4.x branch has been replaced.

It has had all of its javax.websocket-1.1 changes removed.

If you have a local clone of jetty-9.4.x, you will encounter pull/merge issues.

To force your local jetty-9.4.x to be the same as the remote do this ...


$ git checkout jetty-9.4.x
$ git fetch origin
$ git reset --hard origin/jetty-9.4.x


Joakim Erdfelt / [hidden email]


_______________________________________________
jetty-dev mailing list
[hidden email]
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jetty-dev
Reply | Threaded
Open this post in threaded view
|

Re: [jetty-dev] Heads Up - Git branch changes!

Greg Wilkins
Joakim,

I guess that screws over all open PRs.   I see you have closed one without comment.  Did you close any others?
Let's not lose contributions, so please keep them open until they can be closed with a comment saying why - or recreated against the new branch.

cheers


On 10 August 2017 at 07:26, Joakim Erdfelt <[hidden email]> wrote:
Note: you might have to follow up that with a clean of unstaged files/directories.

$ git clean -fd



Joakim Erdfelt / [hidden email]

On Wed, Aug 9, 2017 at 2:22 PM, Joakim Erdfelt <[hidden email]> wrote:
The jetty-9.4.x branch has been replaced.

It has had all of its javax.websocket-1.1 changes removed.

If you have a local clone of jetty-9.4.x, you will encounter pull/merge issues.

To force your local jetty-9.4.x to be the same as the remote do this ...


$ git checkout jetty-9.4.x
$ git fetch origin
$ git reset --hard origin/jetty-9.4.x


Joakim Erdfelt / [hidden email]


_______________________________________________
jetty-dev mailing list
[hidden email]
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jetty-dev



--

_______________________________________________
jetty-dev mailing list
[hidden email]
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jetty-dev